Merge remote-tracking branch 'origin/master'

admin

2019-02-27 0a3b073eb7e6a1c77b73e1d44fe53f040e560ab3

 fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java

@@ -104,7 +104,7 @@
            return;

         }



         qualityFactoryService.addBatch(auctionIdList,lableNames, admin);

         qualityFactoryService.addBatchGoodsByTaoBaoId(auctionIdList,lableNames, admin);



         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("添加成功")));