Merge branch 'refs/heads/master' into master_ljb
# Conflicts: # package-lock.json # package.json # src/mocp/hooks/use-dict/dict-data/index.js # src/mocp/store/base.js # src/mocp/store/user.js
Showing
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
... | @@ -58,8 +58,7 @@ | ... | @@ -58,8 +58,7 @@ |
"clipboard": "^2.0.11", | "clipboard": "^2.0.11", | ||
"dayjs": "^1.11.11", | "dayjs": "^1.11.11", | ||
"lodash": "^4.17.21", | "lodash": "^4.17.21", | ||
"pina": "^0.20.2204228", | "pinia": "^2.0.36", | ||
"pinia": "^2.1.7", | |||
"pinia-plugin-persistedstate": "^3.2.1", | "pinia-plugin-persistedstate": "^3.2.1", | ||
"uview-plus": "^3.2.22", | "uview-plus": "^3.2.22", | ||
"vue": "^3.4.21", | "vue": "^3.4.21", | ||
... | ... |
src/mocp/api/mco.js
0 → 100644
src/mocp/api/support-application.js
0 → 100644
src/mocp/api/system.js
0 → 100644
src/mocp/hooks/use-dict/dict-data/mco.js
0 → 100644
src/mocp/store/mco.js
0 → 100644
src/mocp/store/support-application.js
0 → 100644
src/pages/modules/mocp/panel/mco/details.vue
0 → 100644
src/pages/modules/mocp/panel/mco/list.vue
0 → 100644
src/pages/modules/mocp/panel/mco/search.vue
0 → 100644
Please
register
or
sign in
to comment