Commit Graph

615 Commits

Author SHA1 Message Date
苏竹红
f57cbfa78f feat:云流水 2025-04-17 16:45:28 +08:00
苏竹红
d54537937a feat:云流水 2025-04-17 16:02:12 +08:00
苏竹红
1b7e1928cd feat:云流水 2025-04-16 19:37:15 +08:00
苏竹红
5086c675ab feat:云流水 2025-04-16 19:34:48 +08:00
苏竹红
3467c3f642 feat:云流水 2025-04-16 19:34:16 +08:00
苏竹红
834a330acd feat:云流水 2025-04-16 19:23:33 +08:00
苏竹红
3785dd9f6f Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-16 19:00:30 +08:00
苏竹红
eb9f41454e feat:云流水 2025-04-16 19:00:19 +08:00
shuo.wang
f3c013fa6d fix 2025-04-16 18:38:24 +08:00
shuo.wang
19f27ba4a9 fix 2025-04-16 15:35:57 +08:00
shuo.wang
368a61b8ff fix 2025-04-16 15:33:39 +08:00
苏竹红
5d3a99632f feat:log 2025-04-16 12:21:21 +08:00
苏竹红
7f38827476 feat:OSS切换 2025-04-16 11:38:39 +08:00
苏竹红
2a8a8dffb2 feat:OSS切换 2025-04-16 11:30:18 +08:00
苏竹红
90b875e67b feat:POS 2025-04-15 17:20:07 +08:00
苏竹红
0add15cb80 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-15 13:49:03 +08:00
苏竹红
7bb472de68 feat:POS 2025-04-15 13:48:49 +08:00
shuo.wang
c835844913 fix 2025-04-15 13:38:09 +08:00
shuo.wang
9fb39c20f8 add 2025-04-14 18:07:53 +08:00
shuo.wang
0190a76908 加接口+新管家店名名称 2025-04-14 16:17:56 +08:00
苏竹红
99f9444176 feat:阶段完成 2025-04-13 22:30:56 +08:00
苏竹红
566a4ec51a feat:推送 2025-04-13 21:23:43 +08:00
苏竹红
61d687dd5c Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-13 20:59:06 +08:00
苏竹红
aefc333d5b feat:域名切换 2025-04-13 20:58:26 +08:00
shuo.wang
1c402aecb4 fix 2025-04-13 20:22:19 +08:00
shuo.wang
e123987f3e 增加字段必填校验 2025-04-13 14:08:28 +08:00
shuo.wang
d2202fbc5c fix 2025-04-13 00:31:57 +08:00
shuo.wang
49ec1df2c7 fix 2025-04-12 17:55:33 +08:00
苏竹红
b650b31cb8 feat:域名切换 2025-04-12 16:50:06 +08:00
shuo.wang
6a0aebce31 fix 2025-04-12 16:16:13 +08:00
苏竹红
344de0ac8f Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-12 14:33:03 +08:00
苏竹红
22c19c9f80 feat:mini 2025-04-12 14:32:49 +08:00
shuo.wang
c56cc12f62 增加接口 2025-04-11 21:39:19 +08:00
苏竹红
1c419d10ae Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-11 21:06:13 +08:00
苏竹红
1235b89700 feat:mini 2025-04-11 21:05:38 +08:00
shuo.wang
a958e71521 增加接口 2025-04-11 20:01:15 +08:00
shuo.wang
cc996d8db6 增加接口 2025-04-11 18:47:12 +08:00
苏竹红
49862f9e62 feat:mini 2025-04-11 16:15:18 +08:00
苏竹红
6b058db1b5 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
2025-04-11 16:14:42 +08:00
苏竹红
42d81b1043 feat:mini 2025-04-11 16:11:52 +08:00
shuo.wang
773813c269 增加接口 2025-04-11 16:10:40 +08:00
苏竹红
2a01e15429 feat:mini 2025-04-11 10:52:04 +08:00
苏竹红
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
fd980c0acb fix 2025-04-10 11:31:47 +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
苏竹红
f9219e028e feat:平台账号 2025-04-09 16:55:50 +08:00
苏竹红
1a457343e5 feat:平台账号 2025-04-09 16:12:50 +08:00
苏竹红
abc7c206c4 feat:平台账号 2025-04-09 10:04:35 +08:00