Merge remote-tracking branch 'origin/master'

jiangping

2024-02-18 644dea17d0f553bdd36f5bd3a6f3a946f5e033e2

 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;


}