Merge branch 'dev'

xiangpei

2025-03-03 c9b3df7acb4ed5fecb16b9ca3c90e0341fbfe7e3

 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;