Merge remote-tracking branch 'origin/master'

zhangherong

2 天以前 8b746e482fea845bd6d044d609acc2763783d0bd

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

@@ -94,4 +94,7 @@
    @TableField(exist = false)
    @ApiModelProperty(value = "工单号")
    private String workOrderCode;
    @TableField(exist = false)
    @ApiModelProperty(value = "设备名称")
    private String equipmentName;
}