Commit Graph

2218 Commits

Author SHA1 Message Date
shuo.wang
4a5fcc6c75 fix 2025-04-16 22:02:58 +08:00
shuo.wang
31834dcd73 fix 2025-04-16 22:00:44 +08:00
shuo.wang
413279f6ea fix 2025-04-16 21:06:44 +08:00
shuo.wang
6b2f393f89 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-16 19:27:42 +08:00
苏竹红
834a330acd feat:云流水 2025-04-16 19:23:33 +08:00
shuo.wang
fc72ff946e fix 2025-04-16 19:23:28 +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
52d4507193 fix 2025-04-16 15:34:41 +08:00
shuo.wang
368a61b8ff fix 2025-04-16 15:33:39 +08:00
苏竹红
6fb703d624 feat:云流水 2025-04-16 15:08:23 +08:00
shuo.wang
5ac6d8cccc Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-16 14:56:36 +08:00
shuo.wang
86669d454a fix 2025-04-16 14:56:10 +08:00
苏竹红
d1ed383118 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-16 14:30:52 +08:00
苏竹红
b1ca9ca804 feat:log 2025-04-16 14:30:38 +08:00
shuo.wang
02382591d7 fix 2025-04-16 13:51:50 +08:00
shuo.wang
20283144e8 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-16 13:12:50 +08:00
shuo.wang
2d758f13ed fix 2025-04-16 13:11:57 +08:00
苏竹红
2a8a8dffb2 feat:OSS切换 2025-04-16 11:30:18 +08:00
shuo.wang
f9b6f72d92 fix 2025-04-15 20:53:02 +08:00
shuo.wang
9972b139cc Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-15 19:32:32 +08:00
shuo.wang
7fc775a1be fix 2025-04-15 19:25:19 +08:00
苏竹红
eb73f85ed5 feat:POS 2025-04-15 19:12:25 +08:00
苏竹红
cdd96e7c2b feat:POS 2025-04-15 18:05:57 +08:00
苏竹红
90b875e67b feat:POS 2025-04-15 17:20:07 +08:00
shuo.wang
3d771eeae7 fix 2025-04-15 14:09:45 +08:00
shuo.wang
5b98e6f22d Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-15 14:00:11 +08:00
shuo.wang
e2e1458ec2 fix 2025-04-15 13:59:54 +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
da53fb148c fix 2025-04-15 10:13:17 +08:00
shuo.wang
e1a8e4b423 fix 2025-04-14 20:19:50 +08:00
shuo.wang
9e61375f31 fix 2025-04-14 20:15:57 +08:00
shuo.wang
047eb42ff1 fix 2025-04-14 20:09:58 +08:00
shuo.wang
4eee74fcd1 fix 2025-04-14 19:54:54 +08:00
shuo.wang
9fb39c20f8 add 2025-04-14 18:07:53 +08:00
shuo.wang
86f3d359ad 设计阶段优化 2025-04-14 17:31:04 +08:00
shuo.wang
1f058bf10f 设计阶段优化 2025-04-14 17:26:00 +08:00
shuo.wang
8564e70e13 mini设计阶段确认加校验 2025-04-14 16:29:43 +08:00
shuo.wang
efe854c416 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
2025-04-14 16:19:56 +08:00
shuo.wang
0190a76908 加接口+新管家店名名称 2025-04-14 16:17:56 +08:00
苏竹红
20e0bab663 feat:POS 2025-04-14 15:26:19 +08:00
苏竹红
b5ee71b4c1 feat:POS 2025-04-14 14:06:27 +08:00
苏竹红
6910c6f750 feat:阶段完成 2025-04-14 11:21:18 +08:00
苏竹红
7ca5a4305e feat:阶段完成 2025-04-14 11:06:36 +08:00
苏竹红
f73aa9d1c9 feat:阶段完成 2025-04-13 22:30:13 +08:00
苏竹红
7bcbfcd66d Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-13 22:27:45 +08:00
苏竹红
484d238a92 feat:阶段完成 2025-04-13 22:27:28 +08:00
shuo.wang
90d6148c95 fix 2025-04-13 22:10:28 +08:00