Merge branch 'dev'

xiangpei

2025-03-03 c9b3df7acb4ed5fecb16b9ca3c90e0341fbfe7e3

Merge branch 'dev'

# Conflicts:
#	business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java

 business/src/main/java/com/ycl/domain/entity/ProjectEngineering.java

@@ -56,6 +56,6 @@

    @TableField("year")
    /** 年份 */
    private Date year;
    private String year;

}

 business/src/main/java/com/ycl/domain/form/ProjectEngineeringForm.java

@@ -53,8 +53,7 @@
    private Long unit;

    @ApiModelProperty("年份")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date year;
    private String year;

    @ApiModelProperty("父工程")
    private String parent;

 business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java

@@ -47,24 +47,31 @@
    @ApiModelProperty("状态")
    private String status;


    /** 主管部门 */
    @ApiModelProperty("主管部门")
    private Long department;

    /** 业主单位 */
    @ApiModelProperty("业主单位")
    private Long unit;

    /** 年份 */
    @ApiModelProperty("年份")
    private Date year;
    private String year;

    /** 父工程 */
    @ApiModelProperty("父工程")
    private String parent;

    /** 主管部门名字 */
    @ApiModelProperty("主管部门名字")
    private String departmentName;

    /** 业主单位名字 */
    @ApiModelProperty("业主单位名字")
    private String unitName;


    /** 工程列表 */
    @ApiModelProperty("工程列表")
    private List<ProjectEngineeringVO> children = new ArrayList<ProjectEngineeringVO>();