sudoooooo
|
cf495b60d1
|
Merge branch 'feature/pinia' into develop
# Conflicts:
# web/src/management/components/LeftMenu.vue
# web/src/management/pages/edit/components/ModuleNavbar.vue
# web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
# web/src/management/pages/edit/modules/contentModule/SavePanel.vue
# web/src/management/pages/edit/modules/resultModule/CatalogPanel.vue
# web/src/management/pages/edit/modules/settingModule/SettingPanel.vue
# web/src/management/pages/list/components/BaseList.vue
# web/src/management/pages/list/components/SpaceList.vue
# web/src/management/pages/list/components/SpaceModify.vue
# web/src/management/pages/list/index.vue
# web/src/management/router/index.ts
# web/src/management/store/edit/getters.js
# web/src/management/store/list/index.js
# web/src/management/utils/index.js
# web/src/materials/questions/widgets/BinaryChoiceModule/meta.js
# web/src/materials/questions/widgets/CheckboxModule/meta.js
# web/src/materials/questions/widgets/RadioModule/meta.js
# web/src/materials/questions/widgets/VoteModule/meta.js
# web/src/render/pages/RenderPage.vue
# web/src/render/store/actions.js
# web/src/render/store/mutations.js
# web/src/render/store/state.js
|
2024-07-23 14:14:52 +08:00 |
|
