Merge branch 'master' into 20260623

This commit is contained in:
Your Name
2026-07-02 16:08:14 +08:00
725 changed files with 2638 additions and 93 deletions
@@ -1 +1,5 @@
<<<<<<<< HEAD:server/public/admin/assets/user-CmH1wHFe.js
import{r as e}from"./index-Q-68fWIq.js";function s(){return e.get({url:"/setting.user.user/getConfig"})}function u(t){return e.post({url:"/setting.user.user/setConfig",params:t})}function n(){return e.get({url:"/setting.user.user/getRegisterConfig"})}function g(t){return e.post({url:"/setting.user.user/setRegisterConfig",params:t})}export{s as a,u as b,n as g,g as s};
========
import{r as e}from"./index-BvW4CeSo.js";function s(){return e.get({url:"/setting.user.user/getConfig"})}function u(t){return e.post({url:"/setting.user.user/setConfig",params:t})}function n(){return e.get({url:"/setting.user.user/getRegisterConfig"})}function g(t){return e.post({url:"/setting.user.user/setRegisterConfig",params:t})}export{s as a,u as b,n as g,g as s};
>>>>>>>> master:server/public/admin/assets/user-DmHPw4gk.js