Commit Graph

4795 Commits (c923cc93f0d7ea7594ee82e0272d906e28eb7d89)

Author SHA1 Message Date
tangqian e1920cc1ee fix: 异常加上状态码 2023-05-30 17:01:17 +08:00
perry 3702a8b4ef 商铺名称 2023-05-30 16:29:24 +08:00
perry 26c44490cb 导入 2023-05-30 16:00:28 +08:00
tangqian af701360b7 Merge branch 'master' into feature/mall_product 2023-05-30 15:44:45 +08:00
tangqian ea2461db49 Merge remote-tracking branch 'origin/master' 2023-05-30 15:44:28 +08:00
tangqian ba3be8791c fix: 异常加上状态码 2023-05-30 15:44:21 +08:00
TianYu ab29e2a09f Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-30 14:14:49 +08:00
TianYu 6de30daf0f fix: 修复生成推广员二维码图片异常问题 2023-05-30 14:14:40 +08:00
perry f240bcd408 Merge branch 'feature/mall_product_new' 2023-05-30 14:01:16 +08:00
perry 733aa3d0ae 跳转404 2023-05-30 14:00:56 +08:00
perry fe860b399a 租户数据权限 2023-05-30 10:59:55 +08:00
tianyu 269323dca5 Merge pull request 'feature/mall_product' (#3) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/3
2023-05-30 10:21:40 +08:00
Jruome ff84ef642c 管理端 文案修改 2023-05-30 10:20:32 +08:00
Jruome fc5a55141e 管理端 文案修改 2023-05-30 10:20:14 +08:00
Jruome 95f8e31dac uniapp 会员申请提示修改 2023-05-29 22:16:16 +08:00
Jruome 2eec6a0739 uniapp 明细权益修改 2023-05-29 21:44:08 +08:00
tangqian 2181149f74 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-29 21:31:12 +08:00
tangqian 3b9484ddaf fix: 异常加上状态码 2023-05-29 21:31:07 +08:00
TianYu bebd1393a6 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-29 21:29:14 +08:00
TianYu ca97a7b15d fix: 修复bug 2023-05-29 21:28:55 +08:00
tangqian 985778eb03 fix: 异常加上状态码 2023-05-29 21:26:46 +08:00
tangqian cba853e6a8 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-29 21:25:11 +08:00
tangqian 8ee487046c fix: 异常加上状态码 2023-05-29 21:23:49 +08:00
Jruome 9531301224 uniapp 购买记录状态 2023-05-29 21:16:34 +08:00
Jruome f98f1d5083 uniapp 购买记录状态 2023-05-29 21:08:28 +08:00
tangqian eddde958a5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-29 20:53:55 +08:00
tangqian 678da4381a fix: 修改用户(update-user) 取消入参地址验证 2023-05-29 20:53:50 +08:00
Jruome e219ed543c uniapp 购买记录状态 2023-05-29 20:41:44 +08:00
TianYu 62d0f51a5b fix: 修复ubg 2023-05-29 20:40:56 +08:00
TianYu 205c0637d8 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-29 20:32:52 +08:00
TianYu 87e456e2ab fix: 修复bug 2023-05-29 20:32:39 +08:00
tianyu e6d2a56c54 Merge pull request '合并代码' (#1) from master into feature/mall_product
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/1
2023-05-29 20:29:29 +08:00
tianyu 8310ec40d1 Merge pull request '合并代码' (#2) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/2
2023-05-29 20:27:42 +08:00
tianyu bac30ebbbf Merge branch 'master' into feature/mall_product 2023-05-29 20:25:40 +08:00
TianYu b0771db696 fix: 修复bug 2023-05-29 20:20:33 +08:00
Jruome ef9ee333f7 uniapp 样式修改 2023-05-29 20:19:04 +08:00
tangqian f9a503248e Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-29 20:07:36 +08:00
tangqian 7ce9dabc95 fix: 退出登录忽略租户 2023-05-29 20:05:52 +08:00
Jruome e7145eb51c uniapp input匹配修改 2023-05-29 19:59:33 +08:00
Jruome 79a37da568 uniapp input样式修改 2023-05-29 19:42:30 +08:00
Jruome 4a3d8a01c3 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-29 19:25:57 +08:00
Jruome 855988d631 uniapp bug修改 2023-05-29 19:25:31 +08:00
tangqian 31e0ce4e7a Merge branch 'feature/mall_product' 2023-05-29 19:23:34 +08:00
tangqian 27a3cfedca fix: 退出登录忽略租户 2023-05-29 19:23:23 +08:00
tangqian 575dbb8b6a fix: 退出登录忽略租户 2023-05-29 19:22:48 +08:00
tangqian b1ac278cc2 fix: 退出登录忽略租户 2023-05-29 19:22:22 +08:00
TianYu a8fdac59f5 fix: 修复bug 2023-05-29 19:08:46 +08:00
Jruome 694d8d47b5 uniapp 支付修改 2023-05-29 18:38:23 +08:00
TianYu 28b5ecba88 fix: 修复ubg 2023-05-29 18:29:13 +08:00
Jruome b33fcd347e Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-29 18:29:01 +08:00