sion/sionrui
1
0
Fork 0
Code Issues Pull Requests 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/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
	yudao-user-server/src/main/resources/application-local.yaml
This commit is contained in:
YunaiV
2021-12-16 09:45:50 +08:00
parent 98dfa48ced f94435d592
commit c916b30fa1
801 changed files with 64443 additions and 2416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-admin-ui/src/utils/dict.js
View File

@@ -31,6 +31,9 @@ export const DICT_TYPE = {
TOOL_CODEGEN_TEMPLATE_TYPE: 'tool_codegen_template_type',
OA_LEAVE_STATUS: 'oa_leave_status',
OA_LEAVE_TYPE: 'oa_leave_type'
// 商户状态
PAY_MERCHANT_STATUS: 'pay_merchant_status',
// 应用状态