Commit Graph

3513 Commits

Author SHA1 Message Date
shuo.wang
ec6b526e81 Merge branch 'master' into cc_2025_0421 2025-04-21 21:43:56 +08:00
苏竹红
38d772d8db feat:bug 2025-04-21 21:41:53 +08:00
shuo.wang
76e9d7c149 fix 2025-04-21 21:39:51 +08:00
shuo.wang
90570d4121 fix 2025-04-21 21:26:49 +08:00
苏竹红
4addbc0d33 Merge remote-tracking branch 'origin/cc_2025_0421' into cc_2025_0421 2025-04-21 21:23:19 +08:00
苏竹红
4ded834bee feat:bug 2025-04-21 21:22:58 +08:00
苏竹红
e5a2d249f5 Merge branch 'cc_2025_0421' into 'master'
Cc 2025 0421

See merge request hangzhou/java/custom_zxjp!63
2025-04-21 13:00:41 +00:00
shuo.wang
42f0dc00fd Merge remote-tracking branch 'origin/cc_2025_0421' into cc_2025_0421 2025-04-21 20:51:09 +08:00
shuo.wang
c92b925273 fix 2025-04-21 20:50:52 +08:00
苏竹红
ec956c5fd1 feat:bug 2025-04-21 19:29:59 +08:00
苏竹红
1d92e696be feat:bug 2025-04-21 18:41:42 +08:00
苏竹红
4cf1cb8d78 feat:bug 2025-04-21 18:34:56 +08:00
苏竹红
87b015f782 feat:添加银行 2025-04-21 16:13:21 +08:00
shuo.wang
62aad29949 fix 2025-04-21 11:43:08 +08:00
shuo.wang
4cf5471c61 建店资料副总裁默认值 2025-04-21 11:35:08 +08:00
shuo.wang
65b5d08747 建店资料待办,房东手机号非必填,小程序端采集铺位没有客户name情况 2025-04-21 10:58:14 +08:00
苏竹红
a3a52ffc47 Merge branch 'cc_20250325_select' into 'master'
feat:云流水

See merge request hangzhou/java/custom_zxjp!62
2025-04-18 10:54:00 +00:00
苏竹红
f3eb046b77 feat:云流水 2025-04-18 18:53:27 +08:00
苏竹红
28f9ff3d8a Merge branch 'cc_20250325_select' into 'master'
Cc 20250325 select

See merge request hangzhou/java/custom_zxjp!61
2025-04-18 06:04:17 +00:00
shuo.wang
e59d602356 fix 2025-04-18 13:00:47 +08:00
shuo.wang
65f0bc0c93 fix 2025-04-18 13:00:21 +08:00
shuo.wang
5b2da32ca7 fix 2025-04-18 12:19:47 +08:00
shuo.wang
b37f576376 fix 2025-04-18 12:17:38 +08:00
shuo.wang
74bf1e13c7 fix 2025-04-18 11:44:33 +08:00
shuo.wang
3fa566f676 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-18 11:07:40 +08:00
shuo.wang
43327a3c32 fix 2025-04-18 11:07:01 +08:00
苏竹红
ee7ccc0cde Merge branch 'cc_20250325_select' into 'master'
feat:云流水

See merge request hangzhou/java/custom_zxjp!60
2025-04-17 17:45:21 +00:00
苏竹红
70340f86e8 feat:云流水 2025-04-18 01:44:23 +08:00
苏竹红
f085ded4c8 Merge branch 'cc_20250325_select' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!59
2025-04-17 16:36:59 +00:00
shuo.wang
e130fcc29a fix 2025-04-18 00:24:06 +08:00
shuo.wang
2348c3cc17 fix 2025-04-18 00:17:28 +08:00
shuo.wang
7bbabdb739 fix 2025-04-17 22:06:50 +08:00
shuo.wang
9f71a676c5 fix 2025-04-17 21:47:39 +08:00
苏竹红
3b94def326 Merge branch 'cc_20250325_select' into 'master'
Cc 20250325 select

See merge request hangzhou/java/custom_zxjp!58
2025-04-17 13:08:54 +00:00
shuo.wang
146d4b11cf fix 2025-04-17 21:07:58 +08:00
shuo.wang
fe574d5368 fix 2025-04-17 20:41:58 +08:00
shuo.wang
77bc2240dd Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-17 20:41:14 +08:00
shuo.wang
08a973bd45 fix 2025-04-17 20:40:43 +08:00
苏竹红
dbdd6d5722 Merge branch 'cc_20250325_select' into 'master'
Cc 20250325 select

See merge request hangzhou/java/custom_zxjp!57
2025-04-17 12:14:08 +00:00
苏竹红
96c9e45093 Merge remote-tracking branch 'origin/master' into cc_20250325_select
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-online.properties
2025-04-17 20:13:56 +08:00
shuo.wang
a8a9239c69 fix 2025-04-17 20:09:32 +08:00
shuo.wang
c973f11dc9 fix 2025-04-17 20:05:26 +08:00
shuo.wang
98ddba76fa Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-17 18:38:59 +08:00
shuo.wang
280fb51601 fix 2025-04-17 18:38:38 +08:00
苏竹红
3ba25c9d16 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-17 17:46:26 +08:00
苏竹红
53578e81cd feat:云流水 2025-04-17 17:46:16 +08:00
shuo.wang
593d4fce77 fix 2025-04-17 17:25:07 +08:00
shuo.wang
f3ec2c1939 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-17 17:07:05 +08:00
shuo.wang
7c638677bb fix 2025-04-17 17:06:47 +08:00
苏竹红
51207f3df2 feat:云流水 2025-04-17 16:56:38 +08:00