Go to file

王非凡 3206a20dd6 Merge #34 into master from cc_20260116_new_field

fix:加盟合同新增字段推送红圈通

* cc_20260116_new_field: (5 commits squashed)

  - fix:加盟合同新增字段

  - fix:加盟合同新增字段

  - Merge branch &#39;refs/heads/master&#39; into cc_20260116_new_field
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

  - fix:加盟合同新增字段推送红圈通

  - Merge branch &#39;master&#39; into cc_20260116_new_field
    
    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/34

2026-01-23 08:37:13 +00:00

.m2

feta:切换

2025-12-17 14:05:29 +08:00

coolstore-partner-common

Merge #34 into master from cc_20260116_new_field

2026-01-23 08:37:13 +00:00

coolstore-partner-dao

Merge #32 into master from cc_20260113_open

2026-01-23 06:49:50 +00:00

coolstore-partner-model

Merge #34 into master from cc_20260116_new_field