Commit Graph

6645 Commits

Author SHA1 Message Date
xingyu
9f42e8e102 fix: model 2022-11-15 23:54:06 +08:00
xingyu
1d3fe30add fix: user 2022-11-15 23:46:27 +08:00
xingyu
7db04cf066 refactor: user 2022-11-15 23:44:08 +08:00
xingyu
09e61f7ef3 refactor: sms 2022-11-15 20:43:02 +08:00
xingyu
12ac097b47 perf: vxe 2022-11-15 20:12:32 +08:00
xingyu
a123c47042 refactor: role 2022-11-15 20:12:22 +08:00
YunaiV
b8d1d31df0 trade: 调整退款单 2022-11-15 19:46:30 +08:00
xingyu4j
fb5b71ca9c peaf: vxe grid 2022-11-15 18:07:20 +08:00
xingyu4j
7b64cac984 fix: warn 2022-11-15 17:57:03 +08:00
xingyu4j
9cf4500ed5 refactor: button 2022-11-15 17:51:50 +08:00
xingyu4j
d3526e6f63 refactor: template script 2022-11-15 17:44:28 +08:00
xingyu4j
fabca00f7a refactor: button 2022-11-15 17:42:04 +08:00
xingyu4j
70b8dcb174 refactor: Descriptions 2022-11-15 17:05:05 +08:00
xingyu4j
cbd2815c8e chore: update deps 2022-11-15 16:54:13 +08:00
xingyu4j
66476412bd feat: 增加xgrid注释和判断 2022-11-15 15:22:31 +08:00
xingyu4j
4065387b54 feat: export 2022-11-15 14:51:39 +08:00
xingyu4j
9794d1cfd7 refactor: reloadList 2022-11-15 14:39:39 +08:00
xingyu4j
ecb7ade767 feat: 增加 刷新列表 删除行 获取查询参数 方法 2022-11-15 14:30:10 +08:00
xingyu4j
c7972f9a06 fix: error 2022-11-15 13:59:22 +08:00
xingyu4j
a701c1d76c fix: desc 2022-11-15 13:26:25 +08:00
xingyu4j
c5075dad3b refactor: use XModel 2022-11-15 12:25:19 +08:00
xingyu4j
29f2f99401 fix: dialog 2022-11-15 11:45:25 +08:00
xingyu4j
ddca5f77e0 feat: 移除无用方法 2022-11-15 10:52:27 +08:00
xingyu4j
716266693b fix: dict 2022-11-15 09:17:26 +08:00
xingyu4j
3b107f56a0 fix: todo 2022-11-14 13:19:33 +08:00
xingyu4j
042c4e8390 Merge remote-tracking branch 'origin/master' into feature/vue3 2022-11-14 09:15:19 +08:00
xingyu4j
6171dead14 refactor: use Dialog 2022-11-14 09:15:11 +08:00
YunaiV
f6420e301e 修复部分单元测试报错的问题 2022-11-13 22:05:13 +08:00
YunaiV
38f67d4130 将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中 2022-11-13 21:23:38 +08:00
YunaiV
12d045ea58 修复部分单元测试报错的问题 2022-11-13 21:08:15 +08:00
YunaiV
a543b8c67a 同步商城的最新代码 2022-11-13 19:58:21 +08:00
YunaiV
38d6b51fcc v3.8.4:优化页面内嵌iframe切换tab不刷新数据 2022-11-13 19:53:59 +08:00
YunaiV
e2dba57d8f vue3:测试 client、token、errorCode 模块,导出需要优化 2022-11-13 19:08:32 +08:00
YunaiV
b249b11753 vue3:测试 loginlog 模块,导出需要优化 2022-11-13 18:57:39 +08:00
YunaiV
9832fe5992 vue3:测试 operatelog 模块,导出需要优化 2022-11-13 18:55:31 +08:00
YunaiV
ceeeec1cfd vue3:测试 notice 模块,通过 2022-11-13 18:50:41 +08:00
YunaiV
c6a445c487 1. 将 BasePage 重命名为 PageParam
2. 增加代码注释
3. 调整 menu 重置表单的逻辑,避免写 2 遍 null 的数据
2022-11-13 18:39:19 +08:00
YunaiV
08c772fede 1. 将 BasePage 重命名为 PageParam
2. 增加代码注释
3. 调整 menu 重置表单的逻辑,避免写 2 遍 null 的数据
2022-11-13 18:34:23 +08:00
xingyu4j
89bd2f6d9e Merge remote-tracking branch 'origin/master' into feature/vue3 2022-11-13 15:53:47 +08:00
xingyu4j
f09a1a4b8e refactor: operatelog 2022-11-13 15:38:31 +08:00
xingyu4j
4a692ed28c refactor: loginlog 2022-11-13 15:13:38 +08:00
xingyu4j
866247959e refactor: loginlog vxe 2022-11-13 14:49:59 +08:00
xingyu4j
7250e23df3 refactor: oauth2 vxe 2022-11-13 14:40:51 +08:00
xingyu4j
bdc988e5b7 fix: search 2022-11-13 13:16:21 +08:00
xingyu4j
120417b792 refactor: vxe crud 2022-11-13 13:16:11 +08:00
YunaiV
89580e7903 合并 master 代码 2022-11-13 12:21:17 +08:00
YunaiV
afc76973ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue
2022-11-13 12:07:59 +08:00
芋道源码
29cd9b79de
!299 refactor vue3 vxe crud
Merge pull request !299 from xingyu/feature/vue3
2022-11-13 03:49:08 +00:00
YunaiV
85f83b9760 v3.8.4:修复table中更多按钮切换主题色未生效修复问题 2022-11-13 10:52:23 +08:00
YunaiV
2c43a72fcf v3.8.4:修复主题颜色在Drawer组件不会加载问题(I5VCF0)去除某些svg图标的fill="#bfbfbf"属性,避免菜单激活无法修改其填充颜色。 2022-11-13 10:46:37 +08:00