ZYT/zyt
2
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 20260623

Browse Source
This commit is contained in:
Your Name
2026-07-02 16:08:14 +08:00
parent efd058bce5 3ea3c97c42
commit cea9392239
725 changed files with 2638 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/public/admin/assets/consumer-CRtf4IOy.js
+5
View File
@@ -0,0 +1,5 @@
<<<<<<<< HEAD:server/public/admin/assets/consumer-C46wzoQs.js
import{r}from"./index-Q-68fWIq.js";function u(e){return r.get({url:"/user.user/lists",params:e},{ignoreCancelToken:!0})}function s(e){return r.get({url:"/user.user/detail",params:e})}function n(e){return r.post({url:"/user.user/edit",params:e})}function o(e){return r.post({url:"/user.user/adjustMoney",params:e})}export{o as a,u as b,s as g,n as u};
========
import{r}from"./index-BvW4CeSo.js";function u(e){return r.get({url:"/user.user/lists",params:e},{ignoreCancelToken:!0})}function s(e){return r.get({url:"/user.user/detail",params:e})}function n(e){return r.post({url:"/user.user/edit",params:e})}function o(e){return r.post({url:"/user.user/adjustMoney",params:e})}export{o as a,u as b,s as g,n as u};
>>>>>>>> master:server/public/admin/assets/consumer-CRtf4IOy.js