Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessQuantity.java

@@ -66,34 +66,4 @@
    @ApiModelProperty(value = "备注")
    private String remark;

    @TableField(exist = false)
    private String equipmentId;

    @TableField(exist = false)
    private String startTime;

    @TableField(exist = false)
    private String endTime;

    /**
     * 前台传入 判断每个id
     */
    @TableField(exist = false)
    private String parentId;

    /**
     * 前台传入 车间层级:1 部门层级:2
     */
    @TableField(exist = false)
    private String typeTree;

    /**
     * 部门parentId 关联子集id
     */
    @TableField(exist = false)
    private List<String> mdcSectionIds;

    @TableField(exist = false)
    private String equipmentIds;

}