冲突提交

yujian

2019-03-12 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java

@@ -226,6 +226,12 @@
            out.print(JsonUtil.loadFalseResult("分享商品数量不足"));

            return;

         }

			
         if (listStorageID.size() != 9) {

            out.print(JsonUtil.loadFalseResult("分享商品数量只能是9个"));

            return;

         }

			


         JSONObject data = userGoodsStorageService.shareGoods(uid, listStorageID);

         out.print(JsonUtil.loadTrueResult(data));