合并 master 最新代码

This commit is contained in:
YunaiV
2022-01-23 04:27:57 +08:00
parent 2860108a7d
commit 2a6566d8d6
4 changed files with 7 additions and 6 deletions

View File

@ -41,11 +41,9 @@ export const DICT_TYPE = {
BPM_PROCESS_INSTANCE_STATUS: 'bpm_process_instance_status',
BPM_PROCESS_INSTANCE_RESULT: 'bpm_process_instance_result',
BPM_TASK_ASSIGN_SCRIPT: 'bpm_task_assign_script',
OA_LEAVE_STATUS: 'flow_status', // todo 芋艿:可以删除
BPM_OA_LEAVE_TYPE: 'bpm_oa_leave_type'
OA_LEAVE_STATUS: 'oa_leave_status',
OA_LEAVE_TYPE: 'oa_leave_type',
BPM_OA_LEAVE_TYPE: 'bpm_oa_leave_type',
// pay
// 微信渠道版本
PAY_CHANNEL_WECHAT_VERSION:'pay_channel_wechat_version',
// 支付渠道支付宝算法类型