suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #122 into master from cc_20260511_fix

Browse Source 
feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

* cc_20260511_fix: (5 commits squashed)

  - feat:待采购确认 审批流程

  - feat:问题修复

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - Merge branch 'master' into cc_20260511_fix
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/122
This commit is contained in:
正新
2026-05-11 04:20:57 +00:00
parent fd43c2c4b2
commit ae241d40ca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java
View File

@@ -32,8 +32,8 @@ public enum WalletFeeItemEnum {
EXPENSE_DECORATION_MONEY(316, "expense_decoration_money", "装修费"), EXPENSE_DECORATION_MONEY(316, "expense_decoration_money", "装修费"),
EXPENSE_EQUIPMENT_MONEY(317, "expense_equipment_money", "设备费"), EXPENSE_EQUIPMENT_MONEY(317, "expense_equipment_money", "设备费"),
FIRST_ORDER(321, "expense_first_order_money", "首批订货"), FIRST_ORDER(321, "expense_first_order_money", "首批订货"),
ADVERTISEMENT_FEE(322, "expense_video_device_fee", "监控设备类(立规)"), ADVERTISEMENT_FEE(323, "expense_video_device_fee", "监控设备类(立规)"),
VIDEO_DEVICE_FEE(323, "expense_advertisement_fee", "灯箱广告类(立规)"), VIDEO_DEVICE_FEE(322, "expense_advertisement_fee", "灯箱广告类(立规)"),
LI_GUI_SERVICE_FEE(324, "expense_li_gui_service_fee", "管理服务费(立规)"), LI_GUI_SERVICE_FEE(324, "expense_li_gui_service_fee", "管理服务费(立规)"),
; ;