苏竹红
|
1a9138aaa4
|
feat:getCashierFee
|
2025-12-04 10:21:57 +08:00 |
|
苏竹红
|
3e2b89e254
|
feat:开户支行不为空
|
2025-12-03 19:55:47 +08:00 |
|
苏竹红
|
a1a3b52516
|
Merge #1 into master from cc_20251112_wallet
fix:钱包提现返回结果修改
* cc_20251112_wallet: (1 commits squashed)
- fix:钱包提现返回结果修改
Signed-off-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>
Reviewed-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>
Merged-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/1
|
2025-12-03 09:36:25 +00:00 |
|
苏竹红
|
580c019e34
|
Merge branch 'cc_2021104_twelve_points' into 'master'
Cc 2021104 twelve points
See merge request hangzhou/java/custom_zxjp!201
|
2025-12-02 11:35:47 +00:00 |
|
wangff
|
08f7671427
|
fix
|
2025-12-02 19:35:17 +08:00 |
|
wangff
|
1cbd411598
|
Merge branch 'refs/heads/master' into cc_2021104_twelve_points
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
# coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java
|
2025-12-02 19:34:14 +08:00 |
|
苏竹红
|
44ffaf30bf
|
Merge branch 'cc_20250905_franchiseAgreement' into 'master'
feat:正新三明治
See merge request hangzhou/java/custom_zxjp!200
|
2025-12-02 10:52:41 +00:00 |
|
苏竹红
|
e529a36c32
|
feat:正新三明治
|
2025-12-02 18:49:50 +08:00 |
|
苏竹红
|
c9efff2456
|
feat:contractEndTime
|
2025-12-02 18:35:13 +08:00 |
|
苏竹红
|
82dc2cd47f
|
feat:待缴费才能操作
|
2025-12-02 18:04:05 +08:00 |
|
苏竹红
|
7d69b4ce05
|
Merge branch 'cc_20250905_franchiseAgreement' into 'master'
Cc 20250905 franchise agreement
See merge request hangzhou/java/custom_zxjp!199
|
2025-12-02 09:56:59 +00:00 |
|
苏竹红
|
8091a61917
|
Merge branch 'cc_20251114_minor_req' into 'master'
fix:门店开放接口新增省市区字段
See merge request hangzhou/java/custom_zxjp!198
|
2025-12-02 09:55:44 +00:00 |
|
wangff
|
c1e917ecda
|
fix:门店开放接口新增省市区字段
|
2025-12-02 15:36:50 +08:00 |
|
苏竹红
|
597baa82b9
|
feat:合同
|
2025-12-02 14:03:57 +08:00 |
|
苏竹红
|
8b250b7449
|
feat:合同
|
2025-12-02 13:46:57 +08:00 |
|
苏竹红
|
7dd72ac50c
|
Merge branch 'cc_20251104_xinfa' into 'master'
信发
See merge request hangzhou/java/custom_zxjp!197
|
2025-12-01 08:48:03 +00:00 |
|
wangff
|
d062009c56
|
fix
|
2025-12-01 16:37:40 +08:00 |
|
苏竹红
|
587800ea9d
|
feat:WALLET_API_ERROR
|
2025-12-01 15:24:12 +08:00 |
|
苏竹红
|
71c6446cd3
|
feat:门店编码查询
|
2025-12-01 13:56:39 +08:00 |
|
苏竹红
|
ee54802f7e
|
Merge branch 'master' into cc_20250905_franchiseAgreement
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
# coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
# coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
|
2025-12-01 10:50:32 +08:00 |
|
苏竹红
|
09ef3693a1
|
feat:门店编码查询
|
2025-11-28 16:58:23 +08:00 |
|
苏竹红
|
0f3bafd5ee
|
Merge branch 'cc_20251112_wallet' into 'master'
Cc 20251112 wallet
See merge request hangzhou/java/custom_zxjp!196
|
2025-11-28 08:47:13 +00:00 |
|
苏竹红
|
23eb77a317
|
feat:旗舰店
|
2025-11-28 15:40:57 +08:00 |
|
苏竹红
|
d431a0205f
|
feat:合同
|
2025-11-28 11:18:39 +08:00 |
|
苏竹红
|
6727fe6931
|
feat:合同
|
2025-11-28 11:14:31 +08:00 |
|
苏竹红
|
cea7fe70ea
|
feat:账户余额
|
2025-11-28 09:11:44 +08:00 |
|
苏竹红
|
2531761830
|
feat:existPassword
|
2025-11-27 20:28:51 +08:00 |
|
苏竹红
|
85761cef63
|
feat:setBusinessLicensePhoto
|
2025-11-27 18:32:24 +08:00 |
|
苏竹红
|
7a10dc6bf7
|
Merge branch 'cc_20251112_wallet' into 'master'
钱包
See merge request hangzhou/java/custom_zxjp!194
|
2025-11-27 08:39:10 +00:00 |
|
苏竹红
|
3e86c33b66
|
Merge branch 'cc_20251114_minor_req' into 'master'
fix:门店列表开放接口新增字段
See merge request hangzhou/java/custom_zxjp!193
|
2025-11-27 08:38:57 +00:00 |
|
wangff
|
6ff0ed86fc
|
Merge branch 'refs/heads/master' into cc_20251112_wallet
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
|
2025-11-27 16:38:50 +08:00 |
|
苏竹红
|
d3f560e30e
|
Merge branch 'cc_20251124_token' into 'master'
feat:token
See merge request hangzhou/java/custom_zxjp!195
|
2025-11-27 08:38:47 +00:00 |
|
苏竹红
|
ea8560d14a
|
feat:短信调整
|
2025-11-27 11:14:31 +08:00 |
|
苏竹红
|
c404e6c51a
|
feat:合同
|
2025-11-27 10:23:40 +08:00 |
|
苏竹红
|
c89013ff8d
|
feat:是否存在密码
|
2025-11-26 18:21:24 +08:00 |
|
苏竹红
|
0852a3b376
|
feat:线上
|
2025-11-26 18:12:34 +08:00 |
|
wangff
|
5b44fda2a9
|
fix:开店流程初始化临时关闭钱包阶段
|
2025-11-26 17:49:03 +08:00 |
|
wangff
|
cebd64bf3e
|
fix:开店流程初始化临时关闭钱包阶段
|
2025-11-26 17:38:46 +08:00 |
|
wangff
|
e321dc8fbb
|
fix:门店列表开放接口新增字段
|
2025-11-26 16:13:16 +08:00 |
|
wangff
|
e079a8b83c
|
fix:门店账户分页接口新增字段；打标接口完善
|
2025-11-26 10:11:08 +08:00 |
|
苏竹红
|
7d2b2f40e4
|
feat:backPayFeeStage
|
2025-11-26 10:05:21 +08:00 |
|
wangff
|
ec43537f66
|
fix:门店账户新增字段
|
2025-11-25 18:07:46 +08:00 |
|
wangff
|
c3f00b4a1f
|
fix:门店流水分页查询新增字段
|
2025-11-25 16:52:59 +08:00 |
|
苏竹红
|
1ca3994821
|
feat:合同
|
2025-11-25 16:31:42 +08:00 |
|
wangff
|
e5a3abbdc7
|
fix:账户流水返回结果修改
|
2025-11-25 14:27:42 +08:00 |
|
苏竹红
|
19376134d0
|
feat:正新
|
2025-11-25 13:50:30 +08:00 |
|
苏竹红
|
4206cde16c
|
feat:token
|
2025-11-24 16:52:25 +08:00 |
|
wangff
|
93417c4a4f
|
fix：流水返回对象统一
|
2025-11-24 16:27:19 +08:00 |
|
苏竹红
|
9bc035fffd
|
Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
|
2025-11-24 13:44:58 +08:00 |
|
苏竹红
|
07207847eb
|
feat:身份证背面解析
|
2025-11-24 13:44:45 +08:00 |
|