Commit Graph

4137 Commits

Author SHA1 Message Date
shuo.wang
9fa0d19cd4 Merge branch 'master' into cc_20250723_Decoration
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
2025-07-24 15:29:31 +08:00
shuo.wang
34f46d97ee 装修接口 2025-07-24 15:24:32 +08:00
苏竹红
4ba6266f5c Merge branch 'cc_20250710_userRegion' into 'master'
Cc 20250710 user region

See merge request hangzhou/java/custom_zxjp!138
2025-07-23 09:36:11 +00:00
苏竹红
1c7bfc2d2e Merge branch 'master' into cc_20250710_userRegion
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java
2025-07-23 17:35:05 +08:00
苏竹红
13e6f81286 Merge branch 'cc_20250723_fix_sync' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!139
2025-07-23 09:33:54 +00:00
shuo.wang
cbf5026057 fix 2025-07-23 17:32:45 +08:00
shuo.wang
fbae407c00 装修接口 2025-07-23 17:02:14 +08:00
苏竹红
2110c40298 feat:待签名字符串 2025-07-23 12:11:31 +08:00
苏竹红
c87aa6ba55 feat:过滤掉空的不参与验签 2025-07-23 11:40:19 +08:00
苏竹红
1e0d0e4f29 feat:接口调整 2025-07-23 10:55:54 +08:00
苏竹红
163f747e77 Merge branch 'cc_20250723_fix' into 'master'
Cc 20250723 fix

See merge request hangzhou/java/custom_zxjp!137
2025-07-23 01:49:10 +00:00
苏竹红
1b88d4e15a feat:接口调整 2025-07-23 09:48:47 +08:00
shuo.wang
80e56b6b45 fix验签 2025-07-23 09:47:54 +08:00
shuo.wang
33471d3081 fix验签 2025-07-23 09:46:58 +08:00
shuo.wang
1f8ab1327d fix 2025-07-23 09:40:51 +08:00
苏竹红
7e5a0e440a Merge branch 'cc_20250710_userRegion' into 'master'
Cc 20250710 user region

See merge request hangzhou/java/custom_zxjp!136
2025-07-22 09:44:09 +00:00
苏竹红
1751b28dc7 feat:12 2025-07-22 16:17:01 +08:00
苏竹红
6fad009386 feat:门店人员 2025-07-22 15:57:39 +08:00
苏竹红
2530881858 Merge branch 'cc_20250721_fix' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!135
2025-07-21 09:53:17 +00:00
shuo.wang
d07d46afb9 fix 2025-07-21 09:47:41 +08:00
苏竹红
d4196235f8 Merge branch 'cc_20250710_userRegion' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!134
2025-07-17 12:18:01 +00:00
shuo.wang
72d14ae9c6 fix 2025-07-17 20:16:39 +08:00
苏竹红
a9bd237c24 Merge branch 'cc_20250710_userRegion' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!132
2025-07-17 11:39:42 +00:00
shuo.wang
9321beefa3 fix 2025-07-17 19:38:11 +08:00
苏竹红
268f4b5ad0 Merge branch 'cc_20250710_userRegion' into 'master'
Cc 20250710 user region

See merge request hangzhou/java/custom_zxjp!131
2025-07-17 08:54:21 +00:00
shuo.wang
d94f81cb0c fix 2025-07-16 17:33:00 +08:00
shuo.wang
8e498b56b4 limit 2025-07-16 17:27:42 +08:00
shuo.wang
d455cb643b limit 2025-07-16 17:18:07 +08:00
苏竹红
58a8e7bb4f Merge branch 'cc_20250716_pushdate' into 'master'
Cc 20250716 pushdate

See merge request hangzhou/java/custom_zxjp!130
2025-07-16 03:57:20 +00:00
shuo.wang
5417c9de4d 新管家增加门店编码格式 2025-07-16 10:31:16 +08:00
shuo.wang
cd6966ec41 新管家增加门店编码格式 2025-07-16 10:24:24 +08:00
shuo.wang
d7ffc83128 fix 2025-07-16 09:59:53 +08:00
shuo.wang
4b908f33a3 数据处理 2025-07-15 18:05:11 +08:00
shuo.wang
e8805ee6bc 数据处理 2025-07-15 15:37:20 +08:00
shuo.wang
b3c6e52685 fix 2025-07-15 15:36:55 +08:00
shuo.wang
788fe1843b fix 2025-07-15 15:28:44 +08:00
shuo.wang
070b8f0b8a 增加store校验 2025-07-15 11:05:30 +08:00
shuo.wang
61db5b9d0f fix 2025-07-15 09:23:48 +08:00
shuo.wang
8e74c8d166 fix 2025-07-15 09:21:38 +08:00
shuo.wang
bd8d91fdb8 数据处理 2025-07-14 17:15:06 +08:00
shuo.wang
87eeb43a77 pom 2025-07-14 14:53:00 +08:00
shuo.wang
9cf307a41d pom 2025-07-14 14:52:07 +08:00
shuo.wang
0a70487407 数据处理代码 2025-07-14 14:48:15 +08:00
shuo.wang
d338903801 数据处理代码 2025-07-14 14:47:08 +08:00
shuo.wang
2b0c1a6404 数据处理代码+同步加盟商 2025-07-14 10:09:16 +08:00
shuo.wang
5a0dd61af8 fix 2025-07-11 15:10:23 +08:00
shuo.wang
b247bb9f1b 增加字段 所属管理区域 2025-07-11 13:28:49 +08:00
shuo.wang
e922d2469c 增加字段 所属管理区域 2025-07-11 13:22:46 +08:00
shuo.wang
3d003afc9c 增加字段 所属管理区域 2025-07-11 13:20:50 +08:00
shuo.wang
5f7271b38e fix 2025-07-11 11:01:36 +08:00