Merge remote-tracking branch 'origin/master'

jiangping

2024-02-18 05cf6324ea8322164d99a3d3d4161fe374534b3b

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

@@ -86,6 +86,9 @@
    @ApiModelProperty(value = "方案主键（关联solutions）", example = "1")
    @ExcelColumn(name="方案主键（关联solutions）")
    private Integer solutionId;
    @ApiModelProperty(value = "方案对象", example = "1")
    @TableField(exist = false)
    private Solutions solution;


}