Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f50254e4666734ee038d93169869915f43d7b4a1

 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("添加成功")));