Commit Graph

136 Commits

Author SHA1 Message Date
d7fbe30e8e 拉镜像超时时间延长 2024-10-12 13:26:17 +08:00
8266266387 拼团和秒杀活动获取剩余购买次数接口 2024-10-12 09:35:10 +08:00
6c1b724d93 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-10-11 15:35:47 +08:00
7581ebfa77 秒杀活动首页显示正在进行活动修改 2024-10-11 14:23:23 +08:00
9ba1fe2fdd Merge pull request '秒杀和拼团列表过滤已过期活动' (#39) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #39
2024-10-09 18:26:33 +08:00
7954250450 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-10-09 16:56:00 +08:00
8f7452f7ac 秒杀活动指定显示个数调整 2024-10-09 16:45:06 +08:00
ec7046aab0 小程序秒杀活动接口过滤已过期的 2024-10-09 16:39:30 +08:00
2a93813e68 小程序拼团活动接口过滤已过期的 2024-10-09 16:22:45 +08:00
827563ce06 后台-是否激活卡字段补充 2024-10-09 16:21:56 +08:00
0abbd496ae Merge pull request '修改积分商城订单提交报错' (#38) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #38
2024-10-09 15:42:46 +08:00
2c4b8aa947 修改积分商城订单提交报错 2024-10-09 15:11:12 +08:00
d1c9060ee8 Merge pull request '更新自定义页面积分页面' (#37) from Branch_csl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #37
2024-10-09 14:22:11 +08:00
77
678b0ef892 优化装修默认列数 2024-10-09 14:20:26 +08:00
fc61abbe3b Merge pull request '修改积分商城报错' (#36) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #36
2024-10-09 11:29:03 +08:00
56e27a925e 修改积分商城报错 2024-10-09 10:41:51 +08:00
0d796f45d6 Merge pull request '修改预约模块' (#34) from sjy-one into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #34
2024-10-09 09:18:47 +08:00
09872a3ace 修改预约模块 2024-10-09 09:17:56 +08:00
ba3273db36 Merge pull request '修改积分模块' (#33) from sjy-one into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #33
2024-10-09 09:08:58 +08:00
4eed1940b9 修改积分模块 2024-10-08 20:36:57 +08:00
77
4eca4d4119 更新自定义页面积分页面 2024-10-08 19:58:21 +08:00
7d0017d302 Merge pull request 'cxw' (#32) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #32
2024-10-08 18:17:37 +08:00
bec58cd7eb 合并 2024-10-08 17:50:40 +08:00
2d18b5fdbe Merge pull request 'Branch_csl' (#31) from Branch_csl into master
Reviewed-on: #31
2024-10-08 17:44:32 +08:00
884b9110c4 会员卡片管理和会员权益移植 2024-10-08 17:40:59 +08:00
38fd2ecc6a 修改余额改为使用芋道新更新的 2024-10-08 14:10:21 +08:00
77
d83522607b 将装修列表页面去掉直接在菜单栏里面添加按钮跳转到对应的装修页面 2024-10-05 11:47:25 +08:00
77
d477567030 优化3 2024-09-30 19:02:16 +08:00
77
23fd79bdfe 优化首页装修 2024-09-30 16:02:23 +08:00
00b8b3ab61 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-09-30 10:46:33 +08:00
4eb4515983 更新 yudao-server/run.sh 2024-09-30 10:45:36 +08:00
ef82a0d3f0 更新 yudao-server/src/main/resources/application-local.yaml
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is passing
修改redis密码
2024-09-30 10:23:44 +08:00
0dbf080c99 延长构建超时时间 2024-09-30 09:47:29 +08:00
ba3fcd940e Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-09-30 09:46:36 +08:00
60839f8f7d Merge pull request '修改预约模块构建报错' (#29) from sjy-one into master
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is passing
Reviewed-on: #29
2024-09-30 09:43:26 +08:00
0db74fac5b 会员权益-修改状态字典 2024-09-30 08:55:36 +08:00
1d965addd4 Merge branch 'sjy-one' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-09-30 01:10:08 +08:00
8a7f2b2b28 修改预约模块构建报错 2024-09-30 00:38:00 +08:00
f7577f961a Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-09-29 23:44:54 +08:00
9191ca6c59 付费会员列表模块 2024-09-29 23:34:42 +08:00
9dd4345b7d Merge pull request '修改预约模块' (#28) from sjy-one into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #28
2024-09-29 22:53:59 +08:00
2d9889af9f 付费会员权益模块 2024-09-29 22:35:34 +08:00
1382e792eb 修改预约模块 2024-09-29 20:43:59 +08:00
1e0ee79fb9 Merge pull request '17、后台选择页面添加新增按钮页面路径' (#27) from Branch_csl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #27
2024-09-29 18:38:04 +08:00
07f352c820 更新 yudao-server/run.sh
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-29 18:28:41 +08:00
8d61fbaef7 Merge pull request '新增积分商品,新增拼团、秒杀的小程序以及后端商品查询接口' (#26) from zzw-one into master
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is failing
Reviewed-on: #26
2024-09-29 18:05:06 +08:00
53e30aebaa Merge pull request 'cxw' (#25) from cxw into master
Some checks reported errors
continuous-integration/drone/push Build was killed
Reviewed-on: #25
2024-09-29 18:04:43 +08:00
adc58e6e05 新增积分商品,新增拼团、秒杀的小程序以及后端商品查询接口 2024-09-29 18:03:25 +08:00
77
03f6ec8547 17、后台选择页面添加新增按钮页面路径 2024-09-29 15:27:17 +08:00
79de0c59ab 页面文字修改 2024-09-29 10:15:12 +08:00