From ae241d40ca8243014a8aa6b650126deb9b67c0cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Mon, 11 May 2026 04:20:57 +0000 Subject: [PATCH] Merge #122 into master from cc_20260511_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/122 --- .../java/com/cool/store/enums/fees/WalletFeeItemEnum.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java index de3420b5b..c4be5baac 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java @@ -32,8 +32,8 @@ public enum WalletFeeItemEnum { EXPENSE_DECORATION_MONEY(316, "expense_decoration_money", "装修费"), EXPENSE_EQUIPMENT_MONEY(317, "expense_equipment_money", "设备费"), FIRST_ORDER(321, "expense_first_order_money", "首批订货"), - ADVERTISEMENT_FEE(322, "expense_video_device_fee", "监控设备类(立规)"), - VIDEO_DEVICE_FEE(323, "expense_advertisement_fee", "灯箱广告类(立规)"), + ADVERTISEMENT_FEE(323, "expense_video_device_fee", "监控设备类(立规)"), + VIDEO_DEVICE_FEE(322, "expense_advertisement_fee", "灯箱广告类(立规)"), LI_GUI_SERVICE_FEE(324, "expense_li_gui_service_fee", "管理服务费(立规)"), ;