Merge remote-tracking branch 'origin/master'

cuilei

16 小时以前 76c5ad320495758d4e76d852d96914f1b405ece7

 src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java

@@ -114,5 +114,11 @@
    @TableField(exist = false)
    @ApiModelProperty(value = "仓库名称")
    private String warehouseName;
    @TableField(exist = false)
    @ApiModelProperty(value = "仓库编码")
    private String warehouseCode;
    @TableField(exist = false)
    @ApiModelProperty(value = "报工类型(成品FINISHED、半成品HALF)")
    private String reportType;

}