Merge remote-tracking branch 'origin/master'

zhangherong

5 天以前 0e19bbb301fd4efdcbf3285ade2a149db7d0a613

 src/main/java/org/jeecg/modules/base/entity/Factory.java

@@ -94,4 +94,9 @@
   @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;

    /**产线类型*/
    @Excel(name = "产线类型", width = 15)
    @ApiModelProperty(value = "产线类型")
    private String productionType;
}