Commit Graph

156 Commits

Author SHA1 Message Date
de0408aaad Merge pull request '优化1' (#13) from Branch_csl into master
Reviewed-on: #13
2024-09-20 18:01:44 +08:00
77
dd810ca199 优化1 2024-09-20 17:56:51 +08:00
a05785ae75 Merge pull request '新增种草社区' (#12) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #12
2024-09-20 14:08:22 +08:00
99a62c66f5 种草社区接口优化,营销商品bug修复,新增计算营销活动状态方法,关闭后台文档地址提示信息 2024-09-19 17:50:41 +08:00
f5f0ae372d Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into zzw-one 2024-09-14 12:02:15 +08:00
a58a36745c 新增种草社区 2024-09-14 12:01:30 +08:00
941a4f8787 更新 yudao-server/run.sh
All checks were successful
continuous-integration/drone Build is passing
2024-09-13 17:23:57 +08:00
072e0f8fd3 Merge pull request '后台配置文件调整' (#11) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #11
2024-09-13 15:37:34 +08:00
06800f19b1 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into zzw-one 2024-09-09 17:12:58 +08:00
426ca8ebba 智能表单调整 2024-09-09 17:05:50 +08:00
fae8abba86 智能表单修复 2024-09-09 15:15:50 +08:00
72772ec4a1 后台配置文件调整 2024-09-09 15:01:01 +08:00
1da4cf5a76 revert 02e26691c0
revert Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall
2024-09-09 14:45:10 +08:00
77
02e26691c0 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall 2024-09-09 14:34:36 +08:00
77
cb2c8987a5 .data去掉 2024-09-09 14:34:22 +08:00
3472c840ce Merge pull request '修改预约模块bug' (#10) from sjy-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #10
2024-09-09 14:24:36 +08:00
289a8835cf 修改预约模块bug 2024-09-09 13:22:50 +08:00
77
d100f33096 1
All checks were successful
continuous-integration/drone Build is passing
2024-09-06 18:04:53 +08:00
364d174bd9 Merge pull request '充值模块优化' (#9) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #9
2024-08-26 11:35:34 +08:00
ab0eee51d0 充值模块优化 2024-08-26 10:56:35 +08:00
c1d73ec544 根据构建失败错误修改 2024-08-23 09:46:53 +08:00
e1f3053cc3 Merge pull request '充值模块bug修复' (#8) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #8
2024-08-22 16:50:07 +08:00
5ddedc3b6f 充值模块bug修复 2024-08-22 16:47:12 +08:00
cd09b23027 更新run.sh 2024-08-22 13:51:37 +08:00
fa685ff8e0 Merge pull request '后台配置文件调整' (#7) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #7
2024-08-21 14:57:39 +08:00
783e5f342a 后台配置文件调整 2024-08-20 18:01:41 +08:00
377a444681 Merge pull request '后台配置文件调整' (#6) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #6
2024-08-20 16:36:12 +08:00
271d1d659b 后台配置文件调整 2024-08-20 16:34:16 +08:00
5d7a5a95a2 Merge pull request 'zzw-one' (#5) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #5
2024-08-20 15:20:01 +08:00
56db1a43a6 线上数据库调整 2024-08-20 10:20:27 +08:00
e3c546bdb2 充值模块调整 2024-08-19 18:03:39 +08:00
b3850a58c5 智能表单,砍价 2024-08-16 09:55:26 +08:00
96e50b4462 告警记录优化 2024-08-14 16:28:37 +08:00
3b7cb6da7a 网页图标修改 2024-08-14 13:44:15 +08:00
6da59e82e5 电子面单接口对接 2024-08-12 20:40:24 +08:00
f87d23abeb Merge pull request 'Branch_csl' (#4) from Branch_csl into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #4
2024-08-12 10:47:50 +08:00
9bbecc5baa Merge pull request 'sjy-one' (#3) from sjy-one into master
Reviewed-on: #3
2024-08-12 10:47:42 +08:00
4957916d25 Merge pull request '后台配置文件调整' (#2) from zzw-one into master
Reviewed-on: #2
2024-08-12 10:47:35 +08:00
77
48b79ffd7f 登录页面样式调整 2024-08-12 10:37:12 +08:00
1f8464fd76 微信appid和秘钥配置调整 2024-08-09 17:59:05 +08:00
77
65827a624b Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into HEAD 2024-08-09 17:27:28 +08:00
8913b2215f 添加预约模块前端 2024-08-09 15:06:13 +08:00
28c65b61cb 添加预约模块 2024-08-09 14:53:01 +08:00
0e8fb6acb4 后台样式调整,商城商品分类层级调整 2024-08-09 14:38:05 +08:00
62cb7e4638 后台配置文件调整 2024-08-08 15:29:51 +08:00
acc306bd7e 后台配置文件调整 2024-08-08 14:28:07 +08:00
9049076e95 init 2024-08-08 10:30:00 +08:00
8f083c5940 init 2024-08-08 10:20:57 +08:00
84b125f07d 'init'
All checks were successful
continuous-integration/drone Build is passing
2024-08-07 22:34:52 +08:00
137a31f3aa 'init'
Some checks failed
continuous-integration/drone Build is failing
2024-08-07 16:41:04 +08:00