Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 8ac573030c8fc795d9a30afb739f44393f8b63eb

 src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java

@@ -172,7 +172,7 @@

    @TableField(exist = false)
    @ApiModelProperty(value = "选择的产线id集合")
    private String selectedProduction;
    private String selectedFactory;

    // 关联产线（非数据库字段）
    private transient String productionId;