Merge remote-tracking branch 'origin/master'

xiangpei

2025-03-24 7a79d42944f2535814966e10368b8ef8dce3e0fb

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

@@ -53,12 +53,14 @@
    private Long unit;

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

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

    @ApiModelProperty("建设内容")
    private String buildContent;

    public static ProjectEngineering getEntityByForm(@NonNull ProjectEngineeringForm form, ProjectEngineering entity) {
        if(entity == null) {
          entity = new ProjectEngineering();