Commit Graph

2617 Commits

Author SHA1 Message Date
苏竹红
7a221f7530 防止一直在页面提交 2024-06-03 21:28:39 +08:00
苏竹红
9f2525cbdf 防止一直在页面提交 2024-06-03 17:20:00 +08:00
苏竹红
6e94ee4975 LARGE_REGION 2024-06-03 16:31:19 +08:00
苏竹红
68c209d0ca @Resource 2024-06-03 09:59:07 +08:00
guohb
4ed67b93b4 initiating 2024-05-31 19:25:49 +08:00
guohb
0959ae0dd4 分布式锁,十秒过期 2024-05-31 18:45:15 +08:00
guohb
5e8408d74f 为方法加锁 2024-05-31 17:25:55 +08:00
guohb
84a1495c03 新增加盟商 重复提交 2024-05-31 17:02:09 +08:00
zhangchenbiao
c6b86c4f6b Merge branch 'cc_20240530_bugfix' into 'master'
getSpecialShopStageInfo

See merge request hangzhou/java/custom_xfsg!6
2024-05-30 09:28:08 +00:00
苏竹红
7ac3f7725d getSpecialShopStageInfo 2024-05-30 17:24:46 +08:00
zhangchenbiao
c6a6132dab Merge branch 'cc_partner_init' into 'master'
Cc partner init

See merge request hangzhou/java/custom_xfsg!5
2024-05-29 12:50:26 +00:00
苏竹红
c5483c4866 shop_id 2024-05-29 20:43:50 +08:00
苏竹红
8875201496 getUser 2024-05-29 20:28:51 +08:00
苏竹红
c1aec2124f getUser 2024-05-29 19:55:21 +08:00
shuo.wang
5f7314cd38 首批订货金短信 2024-05-29 19:10:11 +08:00
zhangchenbiao
ca4e400d81 Merge branch 'cc_partener_todo' into 'master'
todo

See merge request hangzhou/java/custom_xfsg!4
2024-05-29 10:00:04 +00:00
guohb
475eafb2f1 Merge remote-tracking branch 'origin/master' into cc_partener_todo
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
2024-05-29 17:59:17 +08:00
guohb
9be9d4e26c fix 2024-05-29 17:50:27 +08:00
zhangchenbiao
491960ca3f Merge branch 'cc_partner_init' into 'master'
fix

See merge request hangzhou/java/custom_xfsg!3
2024-05-29 09:44:46 +00:00
zhangchenbiao
8fa77225a9 fix 2024-05-29 17:44:15 +08:00
zhangchenbiao
be500a5b8c Merge branch 'cc_partner_init' into 'master'
fix

See merge request hangzhou/java/custom_xfsg!2
2024-05-29 09:42:25 +00:00
zhangchenbiao
a5870b76b3 fix 2024-05-29 17:41:52 +08:00
zhangchenbiao
51c48a79ba Merge branch 'cc_partner_init' into 'master'
Cc partner init

See merge request hangzhou/java/custom_xfsg!1
2024-05-29 09:35:30 +00:00
zhangchenbiao
97747a259e Merge branch 'master' into 'cc_partner_init'
# Conflicts:
#   README.md
2024-05-29 09:35:20 +00:00
zhangchenbiao
753f4e24c6 Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-online.properties
2024-05-29 17:17:51 +08:00
zhangchenbiao
57b5fa2bc4 fix 2024-05-29 17:17:08 +08:00
苏竹红
673edcac23 Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init 2024-05-29 17:13:33 +08:00
苏竹红
ce5627aaa0 online 2024-05-29 17:13:25 +08:00
guohb
25c3f09c56 getTrainingExperience 2024-05-29 17:03:43 +08:00
苏竹红
b88260dd9d Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init 2024-05-29 16:44:12 +08:00
苏竹红
b55e697534 online 2024-05-29 16:44:04 +08:00
shuo.wang
8dbe6b457f 首批订货金短信 2024-05-29 15:48:45 +08:00
guohb
e9df48b730 品牌设计经理 2024-05-29 15:16:13 +08:00
苏竹红
734bbd4b07 Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init 2024-05-29 11:01:20 +08:00
苏竹红
afc850e28f hd 2024-05-29 11:01:03 +08:00
guohb
863bfe3172 三方部门表过滤一个 2024-05-29 10:16:59 +08:00
guohb
1a37bdcc78 one 2024-05-29 09:35:36 +08:00
zhangchenbiao
f95b2a147e Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init 2024-05-28 21:26:44 +08:00
zhangchenbiao
273d71171f fix 2024-05-28 21:26:32 +08:00
苏竹红
b310438631 Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init 2024-05-28 20:23:47 +08:00
苏竹红
989dd892c2 hd 2024-05-28 20:23:36 +08:00
guohb
7a617b45a5 店长 2024-05-28 20:22:04 +08:00
苏竹红
476d3c12e4 hd 2024-05-28 20:11:52 +08:00
zhangchenbiao
acdb786416 Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init 2024-05-28 19:55:35 +08:00
zhangchenbiao
757697e7ff fix 2024-05-28 19:55:26 +08:00
guohb
ba7e5c978d message 2024-05-28 19:08:35 +08:00
zhangchenbiao
0edcefe8f6 Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init 2024-05-28 17:28:59 +08:00
zhangchenbiao
7c09e21081 上传租赁合同,修改为选址经理 2024-05-28 17:28:49 +08:00
guohb
67f0a78ed1 date 2024-05-28 15:41:15 +08:00
guohb
6041f49efa fix 2024-05-28 15:19:01 +08:00