Commit Graph

3589 Commits

Author SHA1 Message Date
苏竹红
53b103edda Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-12 16:50:18 +08:00
苏竹红
b650b31cb8 feat:域名切换 2025-04-12 16:50:06 +08:00
shuo.wang
7ef838ca99 fix 2025-04-12 16:21:39 +08:00
shuo.wang
6a0aebce31 fix 2025-04-12 16:16:13 +08:00
shuo.wang
642d4e868c fix 2025-04-12 15:48:11 +08:00
shuo.wang
e2d6c93f83 fix 2025-04-12 14:57:01 +08:00
shuo.wang
2eeba3e844 fix 2025-04-12 14:55:28 +08:00
shuo.wang
51a532d261 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-12 14:53:26 +08:00
shuo.wang
79f20e5876 fix 2025-04-12 14:51:18 +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
51aff7b77c fix 2025-04-12 14:14:01 +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
936b7560ed 增加接口 2025-04-11 20:04:55 +08:00
shuo.wang
a958e71521 增加接口 2025-04-11 20:01:15 +08:00
shuo.wang
eb61984c40 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-11 19:45:21 +08:00
shuo.wang
212b178104 增加接口 2025-04-11 19:45:04 +08:00
苏竹红
075a20de95 feat:mini 2025-04-11 19:43:39 +08:00
苏竹红
dbce883434 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-11 19:26:46 +08:00
苏竹红
90e22b7cf6 feat:mini 2025-04-11 19:26:33 +08:00
shuo.wang
841dcb1d0d 增加接口 2025-04-11 18:57:10 +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
shuo.wang
74571cbd18 fix 2025-04-11 14:32:06 +08:00
shuo.wang
7654d8e520 fix 2025-04-11 14:10:08 +08:00
shuo.wang
f8ec59a1d9 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-11 12:18:20 +08:00
shuo.wang
6c1cf4ad48 fix 2025-04-11 12:16:49 +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
苏竹红
f455a7da93 feat:平台账号升序 2025-04-11 10:28:14 +08:00
shuo.wang
f0806c1435 fix 2025-04-11 10:05:24 +08:00
shuo.wang
c18638f4b9 fix 2025-04-10 21:55:27 +08:00
苏竹红
080019ac0d feat:平台账号 2025-04-10 20:29:57 +08:00
shuo.wang
05d592625e 加字段 2025-04-10 18:51:14 +08:00
shuo.wang
9c5896fc0a 加必填校验 2025-04-10 17:36:03 +08:00
shuo.wang
d07e5ebe80 fix 2025-04-10 16:34:35 +08:00
shuo.wang
7a47e35104 fix 2025-04-10 16:29:41 +08:00
shuo.wang
2c55423f65 fix 2025-04-10 16:15:33 +08:00
shuo.wang
50688f04c8 fix 2025-04-10 16:09:14 +08:00
shuo.wang
46db06a832 fix 2025-04-10 14:59:30 +08:00
shuo.wang
fd980c0acb fix 2025-04-10 11:31:47 +08:00
shuo.wang
f7bbd74990 add 字段 2025-04-10 10:57:09 +08:00
shuo.wang
2cbe1758e5 fix 2025-04-10 10:35:57 +08:00
shuo.wang
e4af38601a fix 2025-04-10 10:13:58 +08:00
shuo.wang
9138676303 fix 2025-04-09 19:46:36 +08:00