Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java

@@ -48,6 +48,10 @@
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "绑定类型：0=子方案；1=主方案", example = "1")
    @ExcelColumn(name="绑定类型：0=子方案；1=主方案")
    private Integer type;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;