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

k94314517

2024-11-29 d1c205d29b5eacf1de22a7af29329ca370d1c2d3

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

@@ -70,8 +70,8 @@
    @ExcelColumn(name="排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "类型 ", example = "1")
    @ExcelColumn(name="类型 ")
    @ApiModelProperty(value = "类型 0企业 1商户 ", example = "1")
    @ExcelColumn(name="类型 0企业 1商户 ")
    private Integer type;

    @ApiModelProperty(value = "统一信用代码")