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

无关风月

2025-08-26 960380f89c9371ba309d6c50b1ab1b677ea74575

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdatePassword.java

@@ -13,6 +13,5 @@
    private String newPassword;

    private String oldPassword;
    // 1平台 2门店
    private Integer type;

}