hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-11-04 20:28:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

Browse Source 
 Conflicts:
	package.json
	src/utils/dict.ts
This commit is contained in:
YunaiV
2023-06-17 17:40:29 +08:00
parent 8666307d47 b809945c19
commit 023539b0db
21 changed files with 1612 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/dict.ts
View File

@@ -161,4 +161,8 @@ export enum DICT_TYPE {
PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
PROMOTION_CONDITION_TYPE = 'promotion_condition_type' // 营销的条件类型枚举
// 积分模块 TODO 芋艿：这里枚举要改下
POINT_BIZ_TYPE = 'point_biz_type',
POINT_STATUS = 'point_status'
}