正新 ae241d40ca Merge #122 into master from cc_20260511_fix ...

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

2026-05-11 04:20:57 +00:00

..

src/main/java/com/cool/store

Merge #122 into master from cc_20260511_fix

2026-05-11 04:20:57 +00:00

pom.xml

feat:钱包接口对接

2025-11-13 18:44:19 +08:00