Commit Graph

2875 Commits

Author SHA1 Message Date
shuo.wang
1fd6e1f005 意向金 加盟费 合同签约增加修改+fix 获取 wx token 2024-11-01 15:35:40 +08:00
shuo.wang
7cc854b59c 意向金 加盟费 合同签约增加修改 2024-10-31 17:08:10 +08:00
shuo.wang
88381ccb8f fix updateShopCode接口增加修改门店name功能 2024-10-30 17:05:19 +08:00
shuo.wang
b388e80ef1 fix 待办增加字段 2024-10-30 15:41:03 +08:00
shuo.wang
5425f73338 fix 2024-10-30 14:46:15 +08:00
shuo.wang
7e95ee0b5c fix getLinePayInfo 2024-10-30 14:22:10 +08:00
shuo.wang
d900e0df03 add 接口跳过营帐通,add 平台建店字段 2024-10-30 10:52:41 +08:00
shuo.wang
0b4dbd4717 fix 2024-10-14 15:23:07 +08:00
shuo.wang
967d2c166a fix 2024-10-14 14:28:58 +08:00
shuo.wang
b3ab67f757 fix 2024-10-13 17:58:18 +08:00
shuo.wang
e95a6c1a57 fix 2024-10-13 17:33:01 +08:00
shuo.wang
0b714a79d7 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-13 14:48:32 +08:00
shuo.wang
f68373d568 fix 2024-10-13 14:47:52 +08:00
苏竹红
f409bff0b7 feat:校验 2024-10-13 14:43:23 +08:00
苏竹红
8a6eaeb4c7 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-13 14:38:19 +08:00
苏竹红
ee59f2bcf5 feat:校验 2024-10-13 14:38:08 +08:00
shuo.wang
637fb7f76b fix 2024-10-13 14:31:43 +08:00
苏竹红
ee996f6b67 feat:校验 2024-10-13 14:27:20 +08:00
苏竹红
bed41067cc feat:校验 2024-10-13 14:18:11 +08:00
苏竹红
9ccf1c6753 feat:校验 2024-10-13 14:01:53 +08:00
苏竹红
4d149210d5 feat:加盟商 2024-10-13 13:15:02 +08:00
苏竹红
e2ee6cf485 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-13 11:09:33 +08:00
苏竹红
0dd51a51ee feat:加盟商 2024-10-13 11:08:32 +08:00
shuo.wang
5cff7d9c30 fix 2024-10-13 10:45:34 +08:00
shuo.wang
494b74bf0f fix 2024-10-13 10:38:58 +08:00
shuo.wang
3c57954256 fix 2024-10-12 22:35:09 +08:00
shuo.wang
892ba5f65e fix 2024-10-12 22:19:59 +08:00
shuo.wang
ddc4533a5f Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 22:12:55 +08:00
shuo.wang
f07bde0a6e fix 2024-10-12 22:12:33 +08:00
苏竹红
5c99afa225 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 21:45:41 +08:00
苏竹红
beb6ea7b03 feat:短信 2024-10-12 21:45:30 +08:00
shuo.wang
34c3818b39 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 20:51:52 +08:00
shuo.wang
528a330633 fix desk 2024-10-12 20:42:50 +08:00
苏竹红
beb9db2977 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 20:28:19 +08:00
苏竹红
33e5bb08f7 feat:shopCode 2024-10-12 20:28:07 +08:00
shuo.wang
d240b0e1de Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 20:25:12 +08:00
shuo.wang
417a1cd8de fix desk 2024-10-12 20:23:46 +08:00
苏竹红
e2a97da1bc Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 20:13:50 +08:00
苏竹红
d74eaab377 feat:排序 2024-10-12 20:13:39 +08:00
shuo.wang
d7b9bb36d5 fix desk 2024-10-12 20:03:10 +08:00
shuo.wang
bdd4c53653 fix desk 2024-10-12 19:44:51 +08:00
shuo.wang
363c95463c fix 2024-10-12 19:38:04 +08:00
shuo.wang
4495f22092 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
2024-10-12 19:36:36 +08:00
shuo.wang
f6953a363d fix 2024-10-12 19:35:36 +08:00
苏竹红
3900475c48 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 19:14:30 +08:00
苏竹红
fd0352c208 feat:排序 2024-10-12 19:14:19 +08:00
shuo.wang
0b528c4dee fix 2024-10-12 19:11:28 +08:00
shuo.wang
0d2b9906af fix 2024-10-12 19:02:14 +08:00
shuo.wang
79eb4bab7e fix desk 2024-10-12 17:23:12 +08:00
shuo.wang
d0051c66e0 fix desk 2024-10-12 17:21:30 +08:00