Merge branch 'master' into 20260623
This commit is contained in:
@@ -1 +1,5 @@
|
||||
<<<<<<<< HEAD:server/public/admin/assets/weapp-BseqzVrZ.js
|
||||
import{r as n}from"./index-Q-68fWIq.js";function s(t){return n.post({url:"/channel.mnp_settings/setConfig",params:t})}function r(){return n.get({url:"/channel.mnp_settings/getConfig"})}export{r as g,s};
|
||||
========
|
||||
import{r as n}from"./index-BvW4CeSo.js";function s(t){return n.post({url:"/channel.mnp_settings/setConfig",params:t})}function r(){return n.get({url:"/channel.mnp_settings/getConfig"})}export{r as g,s};
|
||||
>>>>>>>> master:server/public/admin/assets/weapp-4tzqXCL8.js
|
||||
|
||||
Reference in New Issue
Block a user