shuo.wang
|
4b59c1659e
|
fix
|
2025-04-01 15:38:13 +08:00 |
|
shuo.wang
|
00a57cc6e6
|
获取状态为完成的门店列表接口+记账本定时任务
|
2025-03-31 17:36:10 +08:00 |
|
shuo.wang
|
4e3eda6659
|
PC+mini铺位改造
|
2025-03-31 15:37:22 +08:00 |
|
shuo.wang
|
ae381ea81a
|
记账本
|
2025-03-31 10:14:10 +08:00 |
|
苏竹红
|
4e919f0172
|
Merge branch 'cc_20250324_fix' into 'master'
加盟合同增加字段
See merge request hangzhou/java/custom_zxjp!55
|
2025-03-25 09:59:29 +00:00 |
|
shuo.wang
|
79008aa661
|
加盟合同增加字段
|
2025-03-24 14:23:22 +08:00 |
|
苏竹红
|
3397e9035e
|
Merge branch 'cc_20250312_fix' into 'master'
Cc 20250312 fix
See merge request hangzhou/java/custom_zxjp!54
|
2025-03-20 11:20:46 +00:00 |
|
shuo.wang
|
f0b814cccf
|
fix
|
2025-03-20 18:01:06 +08:00 |
|
shuo.wang
|
c7ae833e0b
|
加盟合同增加字段+导出字段增加
|
2025-03-12 17:40:15 +08:00 |
|
shuo.wang
|
298b46d044
|
加盟合同增加字段+导出字段增加
|
2025-03-12 17:32:50 +08:00 |
|
shuo.wang
|
d740d9ba6c
|
接口加拦截
|
2025-03-12 11:11:22 +08:00 |
|
shuo.wang
|
6f44f627f7
|
接口加拦截
|
2025-03-12 10:37:38 +08:00 |
|
苏竹红
|
c1fbba8b0d
|
Merge branch 'cc_20240228_fix' into 'master'
fix partnerList
See merge request hangzhou/java/custom_zxjp!53
|
2025-03-05 09:33:46 +00:00 |
|
shuo.wang
|
1f81bc47fd
|
fix partnerList
|
2025-03-05 13:47:39 +08:00 |
|
苏竹红
|
ef5a661121
|
Merge branch 'cc_20240228_fix' into 'master'
fix导出
See merge request hangzhou/java/custom_zxjp!52
|
2025-03-04 11:17:08 +00:00 |
|
shuo.wang
|
78fe00cac9
|
fix导出
|
2025-03-04 19:15:21 +08:00 |
|
苏竹红
|
77096dfe2c
|
Merge branch 'cc_20240228_fix' into 'master'
Cc 20240228 fix
See merge request hangzhou/java/custom_zxjp!51
|
2025-03-04 09:33:44 +00:00 |
|
shuo.wang
|
006aab6212
|
fix
|
2025-03-04 16:44:30 +08:00 |
|
shuo.wang
|
c00d2127d3
|
fix
|
2025-03-04 16:16:51 +08:00 |
|
shuo.wang
|
8b203062e9
|
fix
|
2025-03-04 16:16:38 +08:00 |
|
shuo.wang
|
e718a31564
|
fix
|
2025-03-03 20:10:46 +08:00 |
|
shuo.wang
|
26e05b3e7c
|
fix
|
2025-03-03 20:01:01 +08:00 |
|
shuo.wang
|
7e14212fe7
|
add 字段
|
2025-03-03 19:30:28 +08:00 |
|
shuo.wang
|
2534fbc77c
|
导出优化
|
2025-03-01 18:13:56 +08:00 |
|
shuo.wang
|
ae2855f02a
|
导出优化
|
2025-03-01 18:03:10 +08:00 |
|
shuo.wang
|
ceb385dee7
|
fix
|
2025-03-01 17:45:14 +08:00 |
|
shuo.wang
|
dea88558c5
|
fix
|
2025-03-01 17:41:22 +08:00 |
|
shuo.wang
|
ca884abbd2
|
fix
|
2025-03-01 17:38:38 +08:00 |
|
shuo.wang
|
f793b09c89
|
fix
|
2025-03-01 17:34:16 +08:00 |
|
shuo.wang
|
ef12033705
|
fix
|
2025-03-01 17:16:53 +08:00 |
|
苏竹红
|
3124174b5f
|
Merge branch 'cc_20250228_fix_export_bug' into 'master'
fix
See merge request hangzhou/java/custom_zxjp!50
|
2025-02-28 02:00:36 +00:00 |
|
shuo.wang
|
a2094c3ed5
|
fix
|
2025-02-28 09:59:56 +08:00 |
|
苏竹红
|
fff29b5ef4
|
Merge branch 'cc_20250228_fix_export_bug' into 'master'
fix
See merge request hangzhou/java/custom_zxjp!49
|
2025-02-28 01:56:23 +00:00 |
|
shuo.wang
|
638986f216
|
fix
|
2025-02-28 09:49:33 +08:00 |
|
苏竹红
|
0d22935ca2
|
Merge branch 'cc_20250211_v2.6' into 'master'
Cc 20250211 v2.6
See merge request hangzhou/java/custom_zxjp!48
|
2025-02-27 09:59:49 +00:00 |
|
shuo.wang
|
6661802b49
|
fix
|
2025-02-27 17:56:31 +08:00 |
|
shuo.wang
|
f919974484
|
fix优化导出列表
|
2025-02-27 17:29:01 +08:00 |
|
shuo.wang
|
c0532dd18a
|
合同签约增加字段+优化导出列表
|
2025-02-27 14:44:52 +08:00 |
|
shuo.wang
|
dc448aebbf
|
fix
|
2025-02-27 14:19:02 +08:00 |
|
shuo.wang
|
46c6243fd0
|
fix
|
2025-02-27 13:59:05 +08:00 |
|
shuo.wang
|
ba681546f8
|
fix
|
2025-02-26 17:51:56 +08:00 |
|
shuo.wang
|
52eff54e01
|
Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6
|
2025-02-26 17:51:37 +08:00 |
|
苏竹红
|
4716ab6625
|
fix:登录调整
|
2025-02-26 17:10:47 +08:00 |
|
shuo.wang
|
f5ec896b59
|
Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6
|
2025-02-26 16:45:55 +08:00 |
|
苏竹红
|
857c62a333
|
Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6
|
2025-02-26 16:43:24 +08:00 |
|
苏竹红
|
e452412613
|
fix:登录调整
|
2025-02-26 16:43:10 +08:00 |
|
shuo.wang
|
490b06946c
|
Merge branch 'master' into cc_20250211_v2.6
# Conflicts:
# coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
|
2025-02-26 16:33:58 +08:00 |
|
苏竹红
|
f4e50da499
|
Merge branch 'cc_20250224_fixBug' into 'master'
Cc 20250224 fix bug
See merge request hangzhou/java/custom_zxjp!47
|
2025-02-25 09:43:13 +00:00 |
|
shuo.wang
|
6aa06355df
|
fix 导出
|
2025-02-25 16:24:14 +08:00 |
|
shuo.wang
|
1af383917d
|
fix
|
2025-02-25 16:16:38 +08:00 |
|