From b517bfa9578f3fb811a74c9527a5e74a134257d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?=
 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Date: Mon, 11 May 2026 10:23:53 +0000
Subject: [PATCH] Merge #125 into master from cc_20260511_fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat：不需要运营顾问 也能推送

* cc_20260511_fix: (6 commits squashed)

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

  - feat:问题修复

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

  - Merge branch &#39;master&#39; into cc_20260511_fix

    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java

  - feat：不需要运营顾问 也能推送

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/125