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

jiangping

2023-12-20 9d9e3e3f45406bb1a08981b159b50deb0d102e57

 server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java

@@ -15,7 +15,7 @@
public class UserResponse {

    @ApiModelProperty(value = "用户主键")
    private Integer id;
    private String id;

    @ApiModelProperty(value = "姓名")
    private String name;