Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

verou

2025-04-02 2b35183407eb7b1b1524f7b101f1098d9caea042

 rsf-admin/src/page/settings/SecuritySettings.jsx

@@ -38,15 +38,15 @@
        }
    }, [userInfo, setValue])

    const onSubmit = (data) => {
    const onSubmit = (params) => {
        setLoading(true);
        requestResetPassword(data).then(res => {
        requestResetPassword(params).then(res => {
            setLoading(false);
            const { code, msg, data } = res;
            if (code === 200) {
                notify(msg, { type: 'success', messageArgs: { _: msg } });
                reset();
            } else if (code === 408) {
            } else if (code === 10001) {
                setError('oldPassword', {
                    message: msg,
                });
@@ -115,7 +115,7 @@
                        rules={{
                            required: translate('ra.validation.required'),
                            pattern: {
                                value: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,13}$/,
                                value: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d\.]{6,13}$/,
                                message: translate('page.settings.resetPwd.tip.pwdInputLimit'),
                            },
                            validate: (value) => {