Merge remote-tracking branch 'origin/master'

jiangping

2024-10-30 cf295b38650730cc2fbe3bee19c77fdea411095b

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

@@ -76,8 +76,8 @@
    @ExcelColumn(name="图标")
    private String imgurl;

    @ApiModelProperty(value = "类型 0劳务公司 1内部组织")
    @ExcelColumn(name="类型 0劳务公司 1内部组织")
    @ApiModelProperty(value = "类型 0相关方公司 1内部组织")
    @ExcelColumn(name="类型 0相关方公司 1内部组织")
    private Integer type;

    @ApiModelProperty(value = "分类编码(关联category)")