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

nidapeng

2024-03-20 c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25

 server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java

@@ -67,7 +67,7 @@

    @ApiModelProperty(value = "企业编码")
    private Integer companyId;
    @ApiModelProperty(value = "类型 0平台用户 1企业用户")
    @ApiModelProperty(value = "类型 0平台用户 1企业用户 2商户用户")
    private Integer type;

    @ApiModelProperty(value = "密码")