hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-08-22 06:01:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension

Browse Source 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysDictTypeConstants.java
	yudao-admin-server/src/main/resources/application-local.yaml
	yudao-admin-server/src/main/resources/application.yaml
	yudao-admin-server/src/test/resources/sql/clean.sql
	yudao-admin-server/src/test/resources/sql/create_tables.sql
	yudao-admin-ui/src/utils/dict.js
This commit is contained in:
YunaiV
2022-01-23 04:12:34 +08:00
parent 19b574fd4b c612133f22
commit 2860108a7d
547 changed files with 34242 additions and 6477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
yudao-admin-ui/package.json
View File

@@ -40,7 +40,7 @@
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.21.0",
"clipboard": "2.0.6",
"core-js": "3.8.1",
"core-js": "3.19.1",
"echarts": "4.9.0",
"element-ui": "^2.15.6",
"file-saver": "2.0.4",
@@ -58,7 +58,12 @@
"vue-cropper": "0.5.5",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
"vuex": "3.6.0"
"vuex": "3.6.0",
"bpmn-js-token-simulation": "^0.10.0",
"min-dash": "^3.5.2",
"xml-js": "^1.6.11",
"@babel/parser": "^7.7.4",
"throttle-debounce": "^2.1.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.6",
@@ -75,7 +80,22 @@
"sass-loader": "10.1.0",
"script-ext-html-webpack-plugin": "2.1.5",
"svg-sprite-loader": "5.1.1",
"vue-template-compiler": "2.6.12"
"vue-template-compiler": "2.6.12",
"vue2-ace-editor": "^0.0.15",
"@vue/compiler-sfc": "^3.0.1",
"@vue/eslint-config-prettier": "^5.0.0",
"axios": "^0.21.1",
"bpmn-js": "8.9.0",
"bpmn-js-properties-panel": "^0.37.2",
"camunda-bpmn-moddle": "^4.4.1",
"compression-webpack-plugin": "^6.1.1",
"element-ui": "^2.13.2",
"eslint-plugin-prettier": "^3.1.0",
"fs-extra": "^8.1.0",
"terser-webpack-plugin": "^4.2.3",
"webpack-bundle-analyzer": "^3.9.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-plugin-import": "^2.20.0"
},
"engines": {
"node": ">=8.9",