Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8

@@ -43,7 +43,7 @@
     from storage_deposit
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <select id="queryByDepositCode" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="queryByDepositCode" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from storage_deposit

@@ -127,7 +127,7 @@ public class DepositOrderService {
         StorageDeposit storageDeposit = storageDepositMapper.selectByDepositCode(req.getUid(), req.getDepositCode());
         if (null == storageDeposit || null == storageDeposit.getSkup() || null == storageDeposit.getOrderCode()) {
             LOG.warn("storageDepositMapper.selectByDepositCode not exist, req is {}", req);
-            throw new UfoServiceException(400, "库存不存在");
+            throw new UfoServiceException(400, "在库状态的库存不存在");
         }
 
         return storageDeposit;