苏竹红
|
92a212b836
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
# Conflicts:
# coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
# coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
|
2025-04-11 10:29:06 +08:00 |
|
苏竹红
|
080019ac0d
|
feat:平台账号
|
2025-04-10 20:29:57 +08:00 |
|
shuo.wang
|
9c5896fc0a
|
加必填校验
|
2025-04-10 17:36:03 +08:00 |
|
shuo.wang
|
2c55423f65
|
fix
|
2025-04-10 16:15:33 +08:00 |
|
shuo.wang
|
616c8b15f4
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
|
2025-04-09 16:56:50 +08:00 |
|
shuo.wang
|
b329c10432
|
fix
|
2025-04-09 16:56:11 +08:00 |
|
苏竹红
|
abc7c206c4
|
feat:平台账号
|
2025-04-09 10:04:35 +08:00 |
|
shuo.wang
|
d82f99533b
|
改造平台建店接口
|
2025-04-08 20:39:17 +08:00 |
|
shuo.wang
|
80b5afe47f
|
fix + 枚举，仓库数据等
|
2025-04-08 16:38:30 +08:00 |
|
苏竹红
|
4469c44ebb
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
|
2025-04-08 15:23:26 +08:00 |
|
苏竹红
|
c08905399c
|
feat:平台账号
|
2025-04-08 15:22:47 +08:00 |
|
shuo.wang
|
d7869f39da
|
小程序首页模块自定义
|
2025-04-08 14:23:19 +08:00 |
|
shuo.wang
|
26d11b7d17
|
增加字段 同步数据组合
|
2025-04-07 19:37:12 +08:00 |
|
shuo.wang
|
1201bda470
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
|
2025-04-07 10:15:16 +08:00 |
|
shuo.wang
|
4f4ede10f2
|
改造
|
2025-04-07 10:10:41 +08:00 |
|
苏竹红
|
b919960dfc
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
|
2025-04-07 09:19:05 +08:00 |
|
苏竹红
|
8cbf1681db
|
feat:接口验签
|
2025-04-07 09:17:42 +08:00 |
|
shuo.wang
|
c451901924
|
改造
|
2025-04-06 18:34:06 +08:00 |
|
shuo.wang
|
944695ab31
|
铺位，选址改造
|
2025-04-03 14:11:53 +08:00 |
|
shuo.wang
|
3369382c61
|
fix
|
2025-04-02 19:10:22 +08:00 |
|
shuo.wang
|
8d184a1267
|
feat:外部接口对接火马
|
2025-04-02 13:50:28 +08:00 |
|
苏竹红
|
1b917b7284
|
feat:外部接口接入
|
2025-04-02 09:55:00 +08:00 |
|
苏竹红
|
d4cb86b415
|
feat:外部接口接入
|
2025-04-02 09:16:43 +08:00 |
|
苏竹红
|
a54644b8bd
|
feat:外部接口接入
|
2025-04-01 21:36:00 +08:00 |
|
shuo.wang
|
f6fc1c133a
|
Merge branch 'master' into cc_20250327_tallyBook
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
|
2025-04-01 18:50:27 +08:00 |
|
shuo.wang
|
4b59c1659e
|
fix
|
2025-04-01 15:38:13 +08:00 |
|
shuo.wang
|
01933a6d18
|
fix
|
2025-03-31 16:21:23 +08:00 |
|
shuo.wang
|
cc34f3b5f6
|
fix
|
2025-03-31 16:19:17 +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 |
|
shuo.wang
|
f8c6baf98f
|
工作通知调整
|
2025-02-24 18:21:27 +08:00 |
|
shuo.wang
|
a5caca6134
|
工作通知调整
|
2025-02-24 18:06:16 +08:00 |
|
shuo.wang
|
2807bc5b1c
|
工作通知调整
|
2025-02-24 18:00:19 +08:00 |
|
shuo.wang
|
f49159a754
|
测试工作通知
|
2025-02-24 17:02:54 +08:00 |
|
shuo.wang
|
0e5f20d5a2
|
Merge branch 'cc_20250224_fixBug' into cc_20250211_v2.6
|
2025-02-24 14:10:05 +08:00 |
|
shuo.wang
|
639a017534
|
fix 没有审批人增加报错信息
|
2025-02-24 14:05:58 +08:00 |
|
shuo.wang
|
8a43300599
|
fix
|
2025-02-20 10:38:45 +08:00 |
|
shuo.wang
|
6afefe4643
|
add 铺位，选址相关的工作通知
|
2025-02-20 10:30:14 +08:00 |
|
shuo.wang
|
9777d8ecf5
|
add 铺位，选址相关的工作通知
|
2025-02-20 10:25:01 +08:00 |
|
shuo.wang
|
35444f6cb9
|
add 运营方案审核不通过的工作通知
|
2025-02-19 16:22:34 +08:00 |
|
苏竹红
|
bf0d0a80d3
|
fix:登录调整
|
2025-02-19 16:06:21 +08:00 |
|
苏竹红
|
5e00fac82a
|
fix:登录调整
|
2025-02-19 16:02:35 +08:00 |
|
苏竹红
|
82fa96b5af
|
fix:登录调整
|
2025-02-19 15:58:05 +08:00 |
|
shuo.wang
|
eeda40bc86
|
fix 短信通知加盟商姓名未显示
|
2025-02-19 15:16:14 +08:00 |
|
shuo.wang
|
b0749b9c29
|
fix 职位code
|
2025-02-19 13:57:02 +08:00 |
|
shuo.wang
|
50a7700fdf
|
add 企微通知
|
2025-02-17 15:31:25 +08:00 |
|
shuo.wang
|
f78fddf06f
|
add 企微通知
|
2025-02-17 11:04:42 +08:00 |
|
shuo.wang
|
71db4d6e6e
|
Merge branch 'master' into cc_20250211_v2.6
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
|
2025-02-14 16:18:00 +08:00 |
|
shuo.wang
|
8aa877efa5
|
测试企微通知
|
2025-02-11 18:41:19 +08:00 |
|
shuo.wang
|
ca23967be2
|
测试企微通知
|
2025-02-11 16:31:50 +08:00 |
|