Merge branch 'dev'

xiangpei

4 天以前 e85cd3fe826efe0baaa3fc09ea371467127c370c

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

@@ -58,6 +58,9 @@
    @ApiModelProperty("父工程")
    private String parent;

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

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