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

nidapeng

2024-03-29 8f2feb017e56179f756c878cda5056db8286a53b

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

@@ -116,6 +116,7 @@
    @ApiModelProperty(value = "接收文件邮箱")
    @ExcelColumn(name="接收文件邮箱")
    private String email;

    @ApiModelProperty(value = "承包公司")
    @ExcelColumn(name="承包公司")
    private String companyName;