Commit Graph

7515 Commits

Author SHA1 Message Date
luowenfeng
20c79b7053 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-26 14:57:45 +08:00
xingyu
3b3404747e chore: update deps 2022-10-26 09:44:07 +08:00
xingyu
97cab05df2 feat: 升级依赖 2022-10-26 09:16:26 +08:00
xingyu
70fab167be feat: 升级依赖 2022-10-26 09:02:51 +08:00
xingyu
d87dc01dc8 Merge remote-tracking branch 'origin/master' into dev 2022-10-26 09:00:08 +08:00
YunaiV
356642ecea review 商品的 save 界面 2022-10-25 22:13:31 +08:00
luowenfeng
d92d257619 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
2022-10-25 11:15:17 +08:00
YunaiV
7bf37fcb64 优化管理后台的商品分页的查询 2022-10-24 22:12:47 +08:00
YunaiV
c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
chenlei65368
bb8204b5a7
fix WXLitePayClient.java 中copy应忽略的字段
小程序支付,copy应忽略 "privateKeyContent","privateCertContent",而不是“KeyContent”

Signed-off-by: chenlei65368 <chenlei65368@sohu.com>
2022-10-24 10:43:04 +00:00
luowenfeng
dc4e3fcd6e feature(商城): 商城review改 2022-10-24 10:30:47 +08:00
luowenfeng
8c4e3db32b feature(商城): 商城review改 2022-10-24 10:28:07 +08:00
YunaiV
2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
2022-10-23 22:16:54 +08:00
YunaiV
412c017f21 code review 商品模块 2022-10-23 22:15:26 +08:00
YunaiV
3cee922e69 优化 permission 相关的注释 2022-10-23 20:21:10 +08:00
luowenfeng
69c87f8b24 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-22 17:51:45 +08:00
luowenfeng
aea763e96e feature(单元测试): ProductSpuServiceImpl单元测试 2022-10-22 17:51:26 +08:00
xingyu
566238c2dd feat: 升级依赖 2022-10-20 17:46:07 +08:00
xingyu
2b9d96c1b8 chore: update deps 2022-10-20 12:05:51 +08:00
Macro
fc76a67c73
短信接收报告回调处理小Bug
receiveSmsStatus() 方法中最后调用 updateSmsReceiveResult() 方法传参错误,第二个 result.getErrorCode()  应改为 result.getErrorMsg()

Signed-off-by: Macro <8676847+hibernate2021@user.noreply.gitee.com>
2022-10-19 10:28:03 +00:00
xingyu
aa3aa56140 feat: add vxe-table 2022-10-19 18:08:42 +08:00
xingyu
4e415486eb feat: add vxe-table 2022-10-19 17:10:19 +08:00
sfmind
f0e964f180 uni-app:个人信息修改 2022-10-19 10:47:58 +08:00
xingyu
2fcbee0400 docs: update 2022-10-19 10:42:37 +08:00
xingyu
90ad3fc7fc Merge remote-tracking branch 'origin/master' into dev 2022-10-19 10:41:22 +08:00
YunaiV
a13fb61359 优化 pom.xml 文件,减少无用的多租户引用 2022-10-18 23:32:42 +08:00
YunaiV
dc8eb8e362 修复 Redis 地址不正确的问题 2022-10-18 19:57:56 +08:00
huangyemin
b982d87573 支付通知未添加@TenantJob注解,导致定时任务报错 2022-10-18 11:01:47 +08:00
xingyu
469f3d09be feat: update 1.8.2 2022-10-18 10:21:06 +08:00
芋道源码
d1736af6da
!271 升级后端及 vue3部分依赖
Merge pull request !271 from xingyu/dev
2022-10-17 12:24:17 +00:00
luowenfeng
31f5b27d01 feature(uniapp分类): review 2022-10-17 19:55:46 +08:00
zhijiantianya
8940375efa fix mall build error 2022-10-17 13:44:54 +08:00
xingyu
922b39c02c docs: update 2022-10-17 13:02:23 +08:00
xingyu
855d23aec3 feat: 添加提交前验证 2022-10-17 11:24:22 +08:00
xingyu
aa983a6fa9 fix: 代码生成器 2022-10-14 17:52:04 +08:00
xingyu
ff938a9e30 fix: update user error 2022-10-14 16:54:17 +08:00
xingyu
cdeaf5b892 feat: menu add parent 2022-10-14 16:37:18 +08:00
xingyu
00fbc7c5ba feat: 升级apollo 到2.0.1 2022-10-14 14:38:55 +08:00
xingyu
ce92c96a1e Merge remote-tracking branch 'origin/master' into dev 2022-10-14 13:47:34 +08:00
YunaiV
587360a54f 增加内置功能的说明 2022-10-13 23:17:40 +08:00
huzhibo
66cef17fa1
调整前端配置管理中参数分类显示
Signed-off-by: huzhibo <527188553@qq.com>
2022-10-13 10:57:13 +00:00
YunaiV
ca7ea3309b 增加计数架构图 2022-10-13 00:00:01 +08:00
huangyemin
eb48817f7b sql脚本中banner菜单配置错误修改 2022-10-12 15:42:45 +08:00
huangyemin
29d302a901 sql脚本执行报错问题修改 2022-10-12 15:28:00 +08:00
huangyemin
ba20605240 修改配置管理列表的参数分类不显示问题 2022-10-12 14:52:26 +08:00
huangyemin
93135363c6 阿里云OSS解析region时兼容带https的配置 2022-10-12 11:33:29 +08:00
xingyu
f49a55191c update springboot 2.6.12 2022-10-11 17:12:13 +08:00
xingyu
0c362b64c2 fix: 修复新增租户报错 2022-10-11 17:10:57 +08:00
xingyu
9ab4165c4e chore: 更新版本 2022-10-11 16:03:08 +08:00
xingyu
b6347a46aa fix: 类型错误 2022-10-11 16:02:28 +08:00