Merge remote-tracking branch 'origin/master'

cuilei

昨天 f95d05316d49bcdd31d022a11d0fc4fbafb040da

 src/main/java/org/jeecg/modules/base/model/FactoryModel.java

@@ -7,12 +7,13 @@
    // getter和setter方法
    private String value;  // 产线ID
    private String text;   // 产线名称

    private String type;   // 产线类型
    public FactoryModel() {
    }

    public FactoryModel(String value, String text) {
    public FactoryModel(String value, String text, String type) {
        this.value = value;
        this.text = text;
        this.type = type;
    }
}