Merge branch 'dev_1'

yujian

2019-05-14 236b8cd939e9c161d5410f530f9539df7ebba484

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

@@ -129,10 +129,12 @@


      if (page == null || page < 1) {

         out.print(JsonUtil.loadFalseResult("页码不正确"));

         return;

      }



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("用户未登录"));

         return;

      }



      try {