Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 f95d05316d49bcdd31d022a11d0fc4fbafb040da

 src/main/java/org/jeecg/modules/base/service/IFactoryService.java

@@ -50,5 +50,5 @@
     * 查询查询列表
     * @return
     */
    List<Factory> queryProductionLineList();
    List<Factory> queryUserProductionLineList();
}