Merge remote-tracking branch 'origin/master'

admin

2018-12-12 dc73adfa9d92d11d1a8512778deacc34fa877eef

Merge remote-tracking branch 'origin/master'

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

@@ -93,7 +93,7 @@
            int pageSize = Constant.PAGE_SIZE;



            JSONObject data = new JSONObject();

            JSONArray array = null;

            JSONArray array = new JSONArray();



            long count = userGoodsStorageService.countQueryByUid(uid);

            if (count > 0) {


 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java

@@ -38,6 +38,7 @@
        // 保留字段

        cg.setVideoCover(null);

        cg.setVideoUrl(null);

        cg.setState(goods.getState());

        return cg;

    }