Merge remote-tracking branch 'origin/master'

cuilei

昨天 f95d05316d49bcdd31d022a11d0fc4fbafb040da

 src/main/java/org/jeecg/modules/base/controller/FactoryController.java

@@ -226,7 +226,7 @@
    public Result<List<FactoryModel>> queryUserProductionLineList() {
       List<Factory> factoryList = factoryService.queryUserProductionLineList();
       List<FactoryModel> factoryModels = factoryList.stream()
             .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName()))
             .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName(), factory.getProductionType()))
             .collect(Collectors.toList());
       return Result.ok(factoryModels);
    }