Commit Graph

4290 Commits

Author SHA1 Message Date
苏竹红
7275ac5904 feat:zhushuju 2025-08-20 13:38:44 +08:00
苏竹红
5d349465b0 feat:开始同步门店 2025-08-19 16:41:12 +08:00
苏竹红
0ef79bf5fb Merge branch 'cc_20250818_shopCodeFix' into 'master'
feat:更新门店数据

See merge request hangzhou/java/custom_zxjp!152
2025-08-18 11:03:52 +00:00
苏竹红
8d61d5e015 feat:更新门店数据 2025-08-18 09:34:55 +08:00
苏竹红
6aafc3970f feat:主数据同步 2025-08-18 09:29:44 +08:00
苏竹红
10f077400f Merge branch 'cc_20250814_fixBug' into 'master'
fix updateByPrimaryKeySelective

See merge request hangzhou/java/custom_zxjp!151
2025-08-14 05:14:45 +00:00
shuo.wang
3951189e7a fix updateByPrimaryKeySelective 2025-08-14 12:30:13 +08:00
苏竹红
d52faf485b feat:主数据同步 2025-08-13 17:23:00 +08:00
苏竹红
4a222b7a64 Merge branch 'cc_20250812_addField' into 'master'
合同加字段

See merge request hangzhou/java/custom_zxjp!150
2025-08-12 10:09:16 +00:00
shuo.wang
63d1059a37 合同加字段 2025-08-12 15:14:31 +08:00
苏竹红
47caa1c5b6 feat:验签日志 2025-08-11 09:50:44 +08:00
苏竹红
2c8b3028bd Merge branch 'cc_20250808_fixsign' into 'master'
兼容老的验签

See merge request hangzhou/java/custom_zxjp!146
2025-08-11 01:43:42 +00:00
shuo.wang
b27f9653bb add log 2025-08-11 09:39:04 +08:00
shuo.wang
d4c01ec4e6 Merge branch 'master' into cc_20250808_fixsign 2025-08-11 09:34:27 +08:00
苏竹红
6aac1a4925 Merge branch 'cc_20250809_fix' into 'master'
fix  推送数据枚举错误

See merge request hangzhou/java/custom_zxjp!149
2025-08-09 11:53:36 +00:00
shuo.wang
89cf44132e fix 推送数据枚举错误 2025-08-09 19:52:34 +08:00
苏竹红
2332a841b2 Merge branch 'cc_20250809_fix' into 'master'
fix 测量阶段初始化bug

See merge request hangzhou/java/custom_zxjp!148
2025-08-09 11:39:41 +00:00
shuo.wang
1e730b79a6 fix 测量阶段初始化bug 2025-08-09 19:35:20 +08:00
苏竹红
2beaba3354 Merge branch 'cc_20250808_hqt' into 'master'
红圈通字段调整

See merge request hangzhou/java/custom_zxjp!147
2025-08-08 09:32:15 +00:00
shuo.wang
6370f8129f 红圈通字段调整 2025-08-08 17:31:28 +08:00
shuo.wang
734da0c92b 兼容老的验签 2025-08-08 15:00:11 +08:00
shuo.wang
88c34c5cf0 Merge branch 'refs/heads/master' into cc_20250808_fixsign 2025-08-08 11:13:42 +08:00
苏竹红
7455756868 feat:验签关闭 2025-08-08 10:44:37 +08:00
shuo.wang
83b691fa0d 兼容老的验签 2025-08-08 10:33:22 +08:00
苏竹红
6e22ad187e Merge branch 'cc_20250723_Decoration' into 'master'
//,加盟公司自有店->加盟公司建店 不推送数据 再crm中完成

See merge request hangzhou/java/custom_zxjp!145
2025-08-07 12:32:39 +00:00
shuo.wang
6919d31392 //,加盟公司自有店->加盟公司建店 不推送数据 再crm中完成 2025-08-07 19:53:03 +08:00
苏竹红
d4e2f21f6e Merge branch 'cc_20250723_Decoration' into 'master'
//,加盟公司自有店->加盟公司建店 不推送数据 再crm中完成

See merge request hangzhou/java/custom_zxjp!144
2025-08-07 11:30:17 +00:00
shuo.wang
f8943f618a //,加盟公司自有店->加盟公司建店 不推送数据 再crm中完成 2025-08-07 19:28:14 +08:00
苏竹红
b3a92b1638 Merge branch 'cc_20250723_Decoration' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!143
2025-08-07 10:17:35 +00:00
shuo.wang
ccaf78bc27 fix 2025-08-07 18:15:44 +08:00
苏竹红
9709b5ceb4 Merge branch 'cc_20250723_Decoration' into 'master'
Cc 20250723 decoration

See merge request hangzhou/java/custom_zxjp!142
2025-08-07 10:05:08 +00:00
shuo.wang
3f33ed21cb Merge branch 'master' into cc_20250723_Decoration
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2025-08-07 18:03:44 +08:00
shuo.wang
aa1e6fdb22 add log 2025-08-07 17:58:44 +08:00
shuo.wang
15e8fc097c fix 2025-08-07 17:16:59 +08:00
shuo.wang
31758c4e60 待办装修调整 2025-08-07 14:06:39 +08:00
shuo.wang
518144c329 待办装修调整 2025-08-07 13:49:49 +08:00
shuo.wang
c91500f904 装修调整 2025-08-07 11:19:15 +08:00
shuo.wang
91c14e3b51 装修调整 2025-08-06 19:21:51 +08:00
shuo.wang
fe13e9edfa 装修调整 2025-08-06 19:20:13 +08:00
shuo.wang
0cc58a252e 装修调整 2025-08-06 17:53:36 +08:00
shuo.wang
0bfbfd4fe3 装修调整 2025-08-06 17:46:51 +08:00
shuo.wang
71591e985a 装修调整 2025-08-06 17:42:34 +08:00
shuo.wang
b592d793f2 fix 建店完成后续阶段初始化 2025-08-06 13:52:16 +08:00
shuo.wang
67922fdf11 取消必填字段 2025-08-06 11:19:34 +08:00
shuo.wang
45cfc30e0c fix 2025-08-06 10:10:39 +08:00
shuo.wang
52839ab03e 红圈通接口改造 2025-08-06 10:07:02 +08:00
shuo.wang
eb9d469833 红圈通接口改造hqtShopId 2025-08-06 09:25:23 +08:00
苏竹红
3cec36c542 Merge branch 'cc_20250805_store' into 'master'
Cc 20250805 store

See merge request hangzhou/java/custom_zxjp!141
2025-08-05 09:41:44 +00:00
shuo.wang
b7c175c1a4 fix 2025-08-05 16:03:53 +08:00
shuo.wang
b6a0754970 fix 2025-08-05 15:53:46 +08:00