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

jiaosong

2023-10-17 7ec37d4b36111c0192f2c7674b07f8dd1daf1d53

 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;