合并 master 最新的代码

This commit is contained in:
YunaiV
2021-12-16 09:53:02 +08:00
parent c916b30fa1
commit be0b47ecb7
7 changed files with 77 additions and 79 deletions

View File

@ -32,7 +32,7 @@ export const DICT_TYPE = {
TOOL_CODEGEN_TEMPLATE_TYPE: 'tool_codegen_template_type',
OA_LEAVE_STATUS: 'oa_leave_status',
OA_LEAVE_TYPE: 'oa_leave_type'
OA_LEAVE_TYPE: 'oa_leave_type',
// 商户状态
PAY_MERCHANT_STATUS: 'pay_merchant_status',