shizhong
|
cb881018ce
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
yudao-ui-admin/yarn.lock
|
2022-12-29 14:35:53 +08:00 |
|
YunaiV
|
5a4cc55917
|
【修复】字典类型逻辑删除时，唯一索引冲突的问题
|
2022-12-29 12:52:37 +08:00 |
|
YunaiV
|
2c3aaa8d7e
|
修复字典数据(system_dict_data)查询操作有问题，会查出不属于本字典类型(dict_type)的数据
|
2022-12-29 00:16:32 +08:00 |
|
YunaiV
|
3afa09bd98
|
Merge remote-tracking branch 'origin/master'
|
2022-12-29 00:10:06 +08:00 |
|
YunaiV
|
3443aa6f5f
|
优化本地缓存的刷新实现，数据变更时，强制刷新
|
2022-12-29 00:09:58 +08:00 |
|
芋道源码
|
258c1ddb70
|
!343 同步dev分支
Merge pull request !343 from xingyu/dev
|
2022-12-27 14:37:30 +00:00 |
|
YunaiV
|
2706463e49
|
修复 local 环境的配置文件
|
2022-12-27 21:53:03 +08:00 |
|
芋道源码
|
30a4d7d954
|
!342 同步最新版本的商城进度
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
|
2022-12-27 13:39:56 +00:00 |
|
YunaiV
|
aa74df4e5a
|
uniapp：增加部分 confirm 下单确认页
|
2022-12-27 20:38:24 +08:00 |
|
xingyu
|
d86c36a151
|
vue2 圆角标签栏
|
2022-12-27 11:18:06 +08:00 |
|
YunaiV
|
4aeaa21854
|
uniapp：【商品列表】样式 review
|
2022-12-26 22:18:40 +08:00 |
|
YunaiV
|
d4ceceee8c
|
uniapp：【商品详情】对接后端接口
|
2022-12-26 21:29:19 +08:00 |
|
xingyu
|
ab67540d5f
|
fix: crud bug
|
2022-12-26 17:47:48 +08:00 |
|
芋道源码
|
373eff605b
|
!329 修改支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）
Merge pull request !329 from 骑士梦/master
|
2022-12-25 03:39:24 +00:00 |
|
芋道源码
|
9d5a821610
|
!340 修复yudao-module-system-api/ErrorCodeConstants.java中错误码重复的问题
Merge pull request !340 from 王添翼/master
|
2022-12-25 03:38:48 +00:00 |
|
王添翼
|
c0b8000dee
|
修复yudao-module-system-api/ErrorCodeConstants.java中错误码重复的问题
// ========== OAuth2 授权 1002022000 =========
ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1002022000, "code 不存在");
ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1002022000, "code 已过期");
二者错误码重复，现将OAUTH2_CODE_EXPIRE的错误码改为1002022001。
Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
|
2022-12-25 02:20:50 +00:00 |
|
芋道源码
|
79f77e61ba
|
!339 修复 vue3 部分问题
Merge pull request !339 from xingyu/dev
|
2022-12-23 11:26:07 +00:00 |
|
YunaiV
|
92632c046c
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
# yudao-ui-admin/src/views/mall/trade/order/index.vue
|
2022-12-23 19:12:45 +08:00 |
|
YunaiV
|
7a4a6a3046
|
product：优化管理后台相关的接口
area：增加地区列表界面
|
2022-12-23 18:47:59 +08:00 |
|
xingyu
|
6481663c42
|
chore: update deps
|
2022-12-23 18:05:23 +08:00 |
|
xingyu
|
faa6f05d9b
|
fix: vxe 暗黑模式刷新丢失
|
2022-12-23 18:05:14 +08:00 |
|
xingyu
|
fc2b62714c
|
fix: menu error
|
2022-12-23 18:01:02 +08:00 |
|
xingyu
|
31760d9572
|
Merge remote-tracking branch 'origin/master' into dev
|
2022-12-23 17:55:53 +08:00 |
|
xingyu
|
c8f4ba66d1
|
fix: 部门更新 log 错误
|
2022-12-23 16:23:40 +08:00 |
|
芋道源码
|
893b6cf4f2
|
!338 vue3 重构头像上传
Merge pull request !338 from xingyu/dev
|
2022-12-23 00:22:25 +00:00 |
|
xingyu
|
1bb1da5838
|
fix: 代码生成日期类型 LocalDateTime
|
2022-12-22 15:05:49 +08:00 |
|
xingyu
|
bdd8229c97
|
perf: message
|
2022-12-22 14:21:38 +08:00 |
|
xingyu
|
664c6258de
|
chore: update deps
|
2022-12-22 14:15:22 +08:00 |
|
xingyu
|
c7b6030418
|
feat: 添加消息图标面板
|
2022-12-22 14:15:07 +08:00 |
|
xingyu
|
2d5571bcce
|
fix: 版本
|
2022-12-22 10:03:41 +08:00 |
|
xingyu
|
dcb4a1e5e6
|
fix: menu component name
|
2022-12-22 09:06:53 +08:00 |
|
xingyu
|
34c7ecc1a6
|
chore: update deps
|
2022-12-21 16:20:36 +08:00 |
|
xingyu
|
7eb0fb1655
|
fix: close modal
|
2022-12-21 16:18:47 +08:00 |
|
xingyu
|
91abae8898
|
refactor: cropper
|
2022-12-21 16:10:28 +08:00 |
|
xingyu
|
0f562e59c2
|
fix: menu 高度不一致的问题
|
2022-12-21 13:06:19 +08:00 |
|
xingyu
|
4bbfffb9fb
|
Merge remote-tracking branch 'origin/master' into dev
|
2022-12-21 10:20:25 +08:00 |
|
芋道源码
|
b5e0b168c7
|
!337 完善vue3上传组件 && 提升打包速度
Merge pull request !337 from xingyu/dev
|
2022-12-20 12:22:57 +00:00 |
|
芋道源码
|
ea67a47939
|
!336 update codegen/vue3/views/data.ts.vm
Merge pull request !336 from supine-win/N/A
|
2022-12-20 12:21:36 +00:00 |
|
xingyu
|
50c4fb7bfd
|
docs: 优化文档排版
|
2022-12-20 16:36:54 +08:00 |
|
xingyu
|
1ef6016d9d
|
perf: 路由子集显示可配置
|
2022-12-20 16:05:16 +08:00 |
|
xingyu
|
ec0bb01e07
|
perf: 缓存首页
|
2022-12-20 15:52:05 +08:00 |
|
xingyu
|
b88f042d20
|
feat: 当只有一个子菜单时显示父级
|
2022-12-20 15:49:36 +08:00 |
|
xingyu
|
e78e1a9cf1
|
docs: 升级对应版本
|
2022-12-20 15:22:17 +08:00 |
|
xingyu
|
5cf65cf401
|
chore: update deps
|
2022-12-20 15:21:33 +08:00 |
|
xingyu
|
9de323e09c
|
perf: 完善上传组件
|
2022-12-20 15:15:10 +08:00 |
|
xingyu
|
2d79130106
|
chore: update deps
|
2022-12-20 14:21:27 +08:00 |
|
supine-win
|
736a3505a6
|
update codegen/vue3/views/data.ts.vm
字典值类型生成修正
Signed-off-by: supine-win <supine.win@gmail.com>
|
2022-12-20 04:44:25 +00:00 |
|
xingyu
|
85e9a17569
|
fix: 字典类型代码生成
|
2022-12-20 12:44:06 +08:00 |
|
xingyu
|
17d9a4e4f2
|
perf: 优化数据库建表语句
|
2022-12-20 09:10:44 +08:00 |
|
xingyu
|
6c521fd5e0
|
chore: update deps
|
2022-12-19 22:21:36 +08:00 |
|