Commit Graph

4210 Commits

Author SHA1 Message Date
苏竹红
6d54e4de9c feat:门店人员更新 2025-09-25 16:57:55 +08:00
苏竹红
5c353d4de8 feat:store_master_signer_info 2025-09-24 10:06:15 +08:00
苏竹红
67430e9498 Merge branch 'cc_20250905_storeExtendInfo' into 'master'
Cc 20250905 store extend info

See merge request hangzhou/java/custom_zxjp!163
2025-09-24 01:57:58 +00:00
苏竹红
026d5fcdca feat:新增督导查询 2025-09-24 09:56:25 +08:00
wangff
eb53fe9d2d Merge branch 'master' into cc_20250905_storeExtendInfo
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
2025-09-23 14:11:42 +08:00
wangff
48fe55c8be fix 2025-09-23 14:01:48 +08:00
wangff
77cf158d3c fix:获取门店人员信息新增签约人员信息 2025-09-23 14:00:01 +08:00
苏竹红
00aee8919d Merge branch 'cc_20250916_new' into 'master'
fix:获取门店信息开放接口新增收货信息字段

See merge request hangzhou/java/custom_zxjp!162
2025-09-19 09:10:23 +00:00
wangff
b5984f2e01 fix:获取门店信息开放接口新增收货信息字段 2025-09-18 14:22:44 +08:00
苏竹红
c68ae7a701 Merge branch 'cc_20250916_buildstore' into 'master'
Cc 20250916 buildstore

See merge request hangzhou/java/custom_zxjp!160
2025-09-17 09:56:15 +00:00
苏竹红
c4848695fa Merge branch 'cc_20250911_mini_jump' into 'master'
Cc 20250911 mini jump

See merge request hangzhou/java/custom_zxjp!161
2025-09-17 09:56:08 +00:00
苏竹红
f491de1116 feat:bug修复 2025-09-17 13:24:02 +08:00
苏竹红
a76af5b9d1 Merge branch 'cc_20250916_new' into 'master'
fix:新增获取接入物联网门店信息开放接口

See merge request hangzhou/java/custom_zxjp!159
2025-09-16 09:55:37 +00:00
苏竹红
4251b69eab feat:新建店添加合同编码字段 2025-09-16 11:14:54 +08:00
wangff
342c91fb89 fix:新增获取接入物联网门店信息开放接口 2025-09-16 10:50:13 +08:00
苏竹红
5c0bf74249 feat:listByMobile 改造 2025-09-12 10:50:08 +08:00
苏竹红
f0bd951611 feat:第三方id 2025-09-11 14:51:14 +08:00
苏竹红
34ed5679e6 feat:第三方id 2025-09-11 09:32:59 +08:00
苏竹红
fe16305910 feat:getMessageTemplateCode 2025-09-10 19:32:50 +08:00
苏竹红
26bc8c7742 feat:DATE_FORMAT_SEC_9 2025-09-10 19:30:40 +08:00
苏竹红
3ee0ff9fe8 feat:DATE_FORMAT_SEC_9 2025-09-10 19:22:42 +08:00
苏竹红
a95a4077df Merge branch 'cc_20250826_notice' into 'master'
Cc 20250826 notice

See merge request hangzhou/java/custom_zxjp!158
2025-09-09 01:47:16 +00:00
苏竹红
dd2aae3cc8 Merge branch 'master' into cc_20250826_notice
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2025-09-09 09:46:06 +08:00
苏竹红
5c85b79c8e feat:user->person 2025-09-08 10:44:40 +08:00
苏竹红
e682027be5 feat:getStoreListByMobile 2025-09-05 16:23:29 +08:00
苏竹红
910efd055d feat:getStoreListByMobile 2025-09-05 15:51:21 +08:00
苏竹红
36ed7cdb8f feat:跳转链接 2025-09-05 14:53:37 +08:00
苏竹红
339f42ab06 feat:跳转链接 2025-09-05 13:39:29 +08:00
苏竹红
8465432264 feat:校验去掉 2025-09-04 19:12:25 +08:00
苏竹红
2facd1f906 Merge branch 'cc_20250829_openStore' into 'master'
Cc 20250829 open store

See merge request hangzhou/java/custom_zxjp!157
2025-09-04 10:15:17 +00:00
苏竹红
dc5e05f49f feat:获取用户只有督导用户 2025-09-03 18:44:19 +08:00
苏竹红
8b6cc27ab5 Merge branch 'cc_20250902_caipin' into 'master'
feat:获取用户只有督导用户

See merge request hangzhou/java/custom_zxjp!156
2025-09-03 10:20:26 +00:00
苏竹红
a11e150630 feat:获取用户只有督导用户 2025-09-03 17:15:45 +08:00
苏竹红
5d1f424d5b feat:thirdHandleMessage 2025-09-03 14:49:31 +08:00
苏竹红
c496ee7d0e feat:直营店 2025-09-03 11:29:59 +08:00
苏竹红
2679d341cb feat:submitOrUpdate 2025-09-03 09:31:15 +08:00
苏竹红
35a1734ae2 Merge branch 'cc_20250902_caipin' into 'master'
Cc 20250902 caipin

See merge request hangzhou/java/custom_zxjp!155
2025-09-02 08:59:08 +00:00
苏竹红
33e597496c feat:submitOrUpdate 2025-09-02 16:31:25 +08:00
苏竹红
366b208029 feat:submitOrUpdate 2025-09-02 15:43:12 +08:00
苏竹红
b36fbd7af2 feat:franchiseFeeDO 2025-09-02 11:34:39 +08:00
苏竹红
1e71d0dd42 feat:是否统管 2025-09-02 10:42:21 +08:00
苏竹红
5f7109e48b feat:菜品市场门店接口 2025-09-02 10:30:52 +08:00
苏竹红
f9c2222f10 feat:直营店开店 2025-09-01 16:36:44 +08:00
苏竹红
f90feb407d feat:editMatterConfig 2025-09-01 13:20:39 +08:00
苏竹红
56f5d821ca feat:editMatterConfig 2025-09-01 13:19:28 +08:00
苏竹红
88ac3bae11 feat:editMatterConfig 2025-09-01 11:26:45 +08:00
苏竹红
231524eeb0 feat:editMatterConfig 2025-09-01 09:27:17 +08:00
苏竹红
1d2fbab0a1 feat:changePaymentStatus 2025-08-29 16:49:03 +08:00
苏竹红
4b45d133a6 feat:changePaymentStatus 2025-08-29 16:33:51 +08:00
苏竹红
78cebf90d6 feat:handlePersonInfo 2025-08-29 16:02:11 +08:00