shuo.wang
|
41589f2ed3
|
fix 时间格式问题
|
2025-06-23 11:02:41 +08:00 |
|
苏竹红
|
ab3218f33c
|
Merge branch 'cc_20250621_fix' into 'master'
fix 阶段处理人bug
See merge request hangzhou/java/custom_zxjp!116
|
2025-06-21 09:04:55 +00:00 |
|
shuo.wang
|
d4dae58511
|
fix 阶段处理人bug
|
2025-06-21 17:03:17 +08:00 |
|
苏竹红
|
2571ed2956
|
feat：oss配置
|
2025-06-17 14:56:51 +08:00 |
|
苏竹红
|
596c3e9ea1
|
Merge branch 'cc_20250613_fix' into 'master'
Cc 20250613 fix
See merge request hangzhou/java/custom_zxjp!115
|
2025-06-16 10:41:24 +00:00 |
|
shuo.wang
|
fbc7fde73f
|
fix
|
2025-06-16 18:31:27 +08:00 |
|
shuo.wang
|
6ca067693a
|
fix
|
2025-06-16 17:26:27 +08:00 |
|
shuo.wang
|
f09a932e87
|
fix
|
2025-06-16 16:52:36 +08:00 |
|
shuo.wang
|
529e41a0af
|
修改设计师和设计组接口
|
2025-06-16 15:24:50 +08:00 |
|
shuo.wang
|
87ae0108fa
|
新管家生成店名规则
|
2025-06-16 14:42:08 +08:00 |
|
shuo.wang
|
637078730d
|
fix加盟合同
|
2025-06-16 10:05:40 +08:00 |
|
shuo.wang
|
8f484d39fc
|
Merge branch 'master' into cc_20250613_fix
|
2025-06-13 18:04:36 +08:00 |
|
shuo.wang
|
1dd7394258
|
Merge branch 'cc_20250612_payInfo' into cc_20250613_fix
|
2025-06-13 18:03:44 +08:00 |
|
shuo.wang
|
c8a50f3350
|
fix加盟合同
|
2025-06-13 16:17:44 +08:00 |
|
苏竹红
|
dea98ee193
|
feat：线上bug紧急修复
|
2025-06-13 15:46:34 +08:00 |
|
苏竹红
|
bc95e976ce
|
Merge branch 'cc_20250612_desk' into 'master'
加盟费待办增加职位阶段展示对账中
See merge request hangzhou/java/custom_zxjp!114
|
2025-06-12 09:22:23 +00:00 |
|
shuo.wang
|
53ed63596e
|
mini加接口
|
2025-06-12 16:09:10 +08:00 |
|
shuo.wang
|
72d6167104
|
加盟费待办增加职位阶段展示对账中
|
2025-06-12 10:48:33 +08:00 |
|
苏竹红
|
31e09c0e3f
|
Merge branch 'cc_20250609_takeoutBuild' into 'master'
Cc 20250609 takeout build
See merge request hangzhou/java/custom_zxjp!113
|
2025-06-11 10:29:48 +00:00 |
|
苏竹红
|
cb3a23aaf9
|
Merge branch 'cc_20250611_fix' into 'master'
Cc 20250611 fix
See merge request hangzhou/java/custom_zxjp!112
|
2025-06-11 09:38:08 +00:00 |
|
shuo.wang
|
c8337c4f2c
|
fix
|
2025-06-11 17:22:55 +08:00 |
|
苏竹红
|
3d518399f7
|
Merge branch 'cc_20250529_franchise_fee' into 'master'
feat：fix bug修复
See merge request hangzhou/java/custom_zxjp!111
|
2025-06-11 07:11:50 +00:00 |
|
苏竹红
|
538b08040c
|
feat：fix bug修复
|
2025-06-11 15:04:11 +08:00 |
|
shuo.wang
|
54ab03b930
|
fix
|
2025-06-11 13:18:26 +08:00 |
|
shuo.wang
|
59c621bbc9
|
fix
|
2025-06-11 11:11:45 +08:00 |
|
shuo.wang
|
541eac1799
|
fix
|
2025-06-11 11:01:23 +08:00 |
|
shuo.wang
|
ffd502c6f0
|
fix
|
2025-06-11 10:16:46 +08:00 |
|
shuo.wang
|
c2142f7d51
|
筛选store表有效的门店
|
2025-06-11 10:04:33 +08:00 |
|
shuo.wang
|
a40bcbc5e5
|
fix
|
2025-06-11 09:42:19 +08:00 |
|
苏竹红
|
1bcaf34f19
|
Merge branch 'cc_20250605_shopReport' into 'master'
Cc 20250605 shop report
See merge request hangzhou/java/custom_zxjp!110
|
2025-06-10 09:30:02 +00:00 |
|
shuo.wang
|
eaf2db93ff
|
fix
|
2025-06-10 16:41:51 +08:00 |
|
shuo.wang
|
690b4b15f1
|
fix
|
2025-06-10 16:03:48 +08:00 |
|
shuo.wang
|
a4643291f6
|
fix加盟费缴费信息时间问题
|
2025-06-10 16:01:50 +08:00 |
|
shuo.wang
|
b2b694fd46
|
Merge branch 'master' into cc_20250609_takeoutBuild
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
|
2025-06-10 15:44:00 +08:00 |
|
shuo.wang
|
3fe7d80d8f
|
Merge branch 'master' into cc_20250605_shopReport
|
2025-06-10 15:42:39 +08:00 |
|
shuo.wang
|
e4fe4368fd
|
修改结算人信息接口
|
2025-06-10 14:02:58 +08:00 |
|
苏竹红
|
7d28b7f739
|
Merge branch 'cc_20250529_franchise_fee' into 'master'
Cc 20250529 franchise fee
See merge request hangzhou/java/custom_zxjp!109
|
2025-06-09 08:30:02 +00:00 |
|
苏竹红
|
df1ed1cf63
|
Merge branch 'cc_20250606_store_extend' into 'master'
Cc 20250606 store extend
See merge request hangzhou/java/custom_zxjp!108
|
2025-06-09 08:28:59 +00:00 |
|
shuo.wang
|
f9c79eaf0c
|
fix导出
|
2025-06-09 16:19:11 +08:00 |
|
shuo.wang
|
171f3ca08b
|
建店资料同步平台建店
|
2025-06-09 15:39:05 +08:00 |
|
shuo.wang
|
aa789e1e93
|
fix
|
2025-06-09 14:30:02 +08:00 |
|
shuo.wang
|
b195adca33
|
Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee
|
2025-06-09 13:49:55 +08:00 |
|
苏竹红
|
09d6fcc6d8
|
feat：franchiseFeeDataHandler
|
2025-06-09 13:37:47 +08:00 |
|
shuo.wang
|
248d6c8367
|
优化数据处理接口
|
2025-06-09 13:26:28 +08:00 |
|
shuo.wang
|
7d88be8a1d
|
导出接口
|
2025-06-09 10:28:56 +08:00 |
|
苏竹红
|
06fc2affdc
|
feat：门店数据
|
2025-06-06 18:29:42 +08:00 |
|
shuo.wang
|
ba796a1d08
|
fix
|
2025-06-06 17:57:34 +08:00 |
|
shuo.wang
|
1eb42edb88
|
fix
|
2025-06-06 13:52:03 +08:00 |
|
shuo.wang
|
d71dfb05c5
|
//审批拒绝阶段 数据处理
|
2025-06-06 11:34:09 +08:00 |
|
shuo.wang
|
d6051898c0
|
fix
|
2025-06-06 10:59:29 +08:00 |
|