解决冲突

liurunyu

2024-07-25 7af935e6a092193adf309f3a2d700f049b4b63d8

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/ResetPasswordVo.java

@@ -16,6 +16,4 @@
    @Schema(description = "用户ID")
    public String id ;

    @Schema(description = "新密码")
    public String password ;
}