Commit Graph

3164 Commits

Author SHA1 Message Date
shuo.wang
d1bcd2c558 fix 开店详情 2025-01-15 11:35:29 +08:00
shuo.wang
d1975cb87e fix 开店详情增加字段 2025-01-15 11:04:33 +08:00
shuo.wang
cffd9d8624 fix 开店管理 2025-01-15 09:57:19 +08:00
shuo.wang
33db0a92ee fix 开店管理 2025-01-15 09:54:27 +08:00
shuo.wang
73a3ab769d fix 开店管理查询条件 2025-01-14 19:03:29 +08:00
shuo.wang
a98828529a fix 开店管理根据意向区域查询 2025-01-14 18:48:40 +08:00
shuo.wang
a5747908e2 fix /getLines返回分页 2025-01-14 18:23:41 +08:00
苏竹红
11e7026270 Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4 2025-01-14 15:55:16 +08:00
苏竹红
0df3a20015 feat:V2.4 2025-01-14 15:54:54 +08:00
shuo.wang
abbc26370f fix 2025-01-14 15:52:34 +08:00
shuo.wang
85aeaa4243 fix 2025-01-14 11:40:31 +08:00
shuo.wang
9651ced5a1 fix 2025-01-14 11:39:07 +08:00
shuo.wang
1e66c58717 Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4 2025-01-14 11:33:27 +08:00
shuo.wang
79bd4d68eb fix 2025-01-14 11:33:00 +08:00
苏竹红
de2b7e39cf Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4 2025-01-14 11:32:07 +08:00
苏竹红
fc622ef0ab feat:V2.4 2025-01-14 11:31:40 +08:00
shuo.wang
e15dbdd99f fix 2025-01-13 16:38:41 +08:00
shuo.wang
15549ce269 fix 2025-01-13 14:54:40 +08:00
shuo.wang
06e37e0e89 fix 2025-01-13 14:53:18 +08:00
苏竹红
5d2afdf9c5 feat:V2.4 2025-01-10 19:02:16 +08:00
苏竹红
81b135bba6 Merge branch 'master' into cc_20250106_v2.4
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
2025-01-10 18:35:32 +08:00
shuo.wang
c738cfebf7 fix 2025-01-10 18:03:54 +08:00
shuo.wang
0ee5a24a76 修改增加意向门店接口 2025-01-10 18:00:32 +08:00
shuo.wang
2f962e4039 修改增加意向门店接口 2025-01-10 17:22:27 +08:00
shuo.wang
1b752aff83 优化待办接口 2025-01-10 16:05:16 +08:00
shuo.wang
c4199ee27c 加盟商详情,门店列表 2025-01-10 14:22:42 +08:00
苏竹红
47c8d0d585 Merge branch 'cc_20250107_v2.3.1' into 'master'
Cc 20250107 v2.3.1

See merge request hangzhou/java/custom_zxjp!38
2025-01-09 10:43:16 +00:00
shuo.wang
2d94266e62 开店列表+导出 2025-01-09 17:18:21 +08:00
shuo.wang
4acd471fbd 门店转让记录,修改门店招商专员/督导接口 2025-01-08 17:32:54 +08:00
shuo.wang
96f8ad4a7e 新建分店接口 2025-01-08 16:08:56 +08:00
shuo.wang
3579bb5f7c 查找加盟商接口,改造跟进日志接口 2025-01-08 14:19:07 +08:00
苏竹红
5ad1dc3ae1 feat:bugfix 2025-01-07 15:49:18 +08:00
苏竹红
860906fe3d feat:bugfix 2025-01-07 15:41:43 +08:00
苏竹红
5c68a76217 feat:bugfix 2025-01-07 14:55:59 +08:00
苏竹红
fae4d72e3b feat:V2.3.1 2025-01-07 14:40:56 +08:00
苏竹红
ea9caaa6f1 Merge branch 'cc_20241226_ocr' 2025-01-04 10:40:50 +08:00
苏竹红
8d7d6c43d1 feat:配重 2025-01-04 10:37:44 +08:00
苏竹红
b967182b6f Merge branch 'cc_20241226_ocr' into 'master'
Cc 20241226 ocr

See merge request hangzhou/java/custom_zxjp!37
2025-01-03 08:59:58 +00:00
苏竹红
4a1ae375c7 feat:保留两位 2025-01-03 09:28:05 +08:00
苏竹红
7691501ffe feat:保留两位 2025-01-02 17:50:00 +08:00
苏竹红
632fced1fa feat:保留两位 2025-01-02 17:47:53 +08:00
苏竹红
5ee1e852e8 feat:保留两位 2025-01-02 17:27:37 +08:00
苏竹红
ffbf8ed330 feat:发票回传数据处理 2025-01-02 16:14:24 +08:00
苏竹红
85ccaf5dea feat:发票回传数据处理 2025-01-02 15:40:29 +08:00
苏竹红
154b5d1aaf feat:发票回传解析 2025-01-02 14:41:13 +08:00
苏竹红
6773632757 feat:发票回传 2025-01-02 14:16:36 +08:00
苏竹红
b76e1a8968 feat:发票回传 2025-01-02 11:09:37 +08:00
苏竹红
91d2e4799d feat:发票回传 2025-01-02 10:48:03 +08:00
苏竹红
274fc7ccf9 feat:发票回传 2025-01-02 10:26:25 +08:00
苏竹红
5d58481259 Merge branch 'cc_20241219_license' into 'master'
Cc 20241219 license

See merge request hangzhou/java/custom_zxjp!36
2024-12-24 10:03:13 +00:00