Merge branch 'master' into div1

yujian

2019-01-10 391f2e33973b93b0aee53ca93affb1c92eb9a9d7

 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));