xingyu4j
|
7083d991fe
|
refactor: verify
|
3 years ago |
xingyu4j
|
042c4e8390
|
Merge remote-tracking branch 'origin/master' into feature/vue3
|
3 years ago |
xingyu4j
|
89bd2f6d9e
|
Merge remote-tracking branch 'origin/master' into feature/vue3
|
3 years ago |
xingyu4j
|
bdc988e5b7
|
fix: search
|
3 years ago |
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
|
3 years ago |
YunaiV
|
85f83b9760
|
v3.8.4:修复table中更多按钮切换主题色未生效修复问题
|
3 years ago |
YunaiV
|
3310b766bc
|
【修复】工作流程-流程管理-流程模型,在发布完流程后,点击激活状态的按钮,显示“是否确认挂起流程名字为‘xxx’‘的数据项“,点击取消,前端显示的激活状态改变,但是数据库没有更新,报错
|
3 years ago |
YunaiV
|
9e39356512
|
【修复】数据字典列表的 status 下拉无数据的情况
|
3 years ago |
YunaiV
|
e4036842de
|
【修复】自定义 ICON 不生效的问题
|
3 years ago |
YunaiV
|
7093ed3997
|
【修复】钉钉登录时,重定向后 type 丢失导致报错的问题
|
3 years ago |
YunaiV
|
1dfb37b11f
|
修复用户直接点击登录界面的三方登录,报“租户的请求未传递,请进行排查”的错误
|
3 years ago |
芋道源码
|
c022755ec5
|
!278 调整前端配置管理中参数分类显示
Merge pull request !278 from huzhibo/N/A
|
3 years ago |
YunaiV
|
d3b6a0ca69
|
1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
|
3 years ago |
xingyu4j
|
0f40947721
|
升级部分依赖
|
3 years ago |
xingyu4j
|
011dc23699
|
替换var 为const/let
删除未使用import
替换 == 为 ===
|
3 years ago |
xingyu4j
|
c9e11e7636
|
fix slot-scope
|
3 years ago |
xingyu4j
|
d730c50dee
|
修复代码警告
|
3 years ago |
LAPTOP-CNV4CMCJ\cheng
|
fb45f22533
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
LAPTOP-CNV4CMCJ\cheng
|
ea5e6b2c0e
|
新增了订单详情
|
3 years ago |
YunaiV
|
941782fb10
|
promotion:完善限时折扣的修改逻辑
|
3 years ago |
YunaiV
|
6d48bd1ed8
|
promotion:完善限时折扣的添加逻辑
|
3 years ago |
YunaiV
|
d4b7f4aaa0
|
promotion:增加限时折扣的基础代码
|
3 years ago |
YunaiV
|
00f90e75d9
|
promotion:增加满减送活动的关闭功能
|
3 years ago |
YunaiV
|
873b530652
|
promotion:增加优惠劵的回收操作
|
3 years ago |
YunaiV
|
47c2dfa623
|
promotion:增加优惠劵的前端分页界面 100%
|
3 years ago |
YunaiV
|
86b6b85934
|
promotion:增加优惠劵的前端分页界面 80%
|
3 years ago |
YunaiV
|
8ae8a4a652
|
promotion:完善优惠劵模板的单元测试、禁用功能
|
3 years ago |
YunaiV
|
e3a700b2d2
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
3 years ago |
YunaiV
|
bd661296c0
|
promotion:完善优惠劵模板的功能
|
3 years ago |
LAPTOP-CNV4CMCJ\cheng
|
63cb9eb47e
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
LAPTOP-CNV4CMCJ\cheng
|
89fefc5f81
|
处理了商品订单的TODO
|
3 years ago |
YunaiV
|
2aaeb7af88
|
promotion:实现部分优惠劵模板的前端表单 80%
|
3 years ago |
YunaiV
|
dc51a93533
|
promotion:实现部分优惠劵模板的前端列表
|
3 years ago |
YunaiV
|
3c10058dbd
|
promotion:实现部分优惠劵模板的前端逻辑
|
3 years ago |
YunaiV
|
035c2cf28c
|
promotion:完善 优惠劵模板 表~
|
3 years ago |
YunaiV
|
cca27636b7
|
code review 订单列表.vue 界面
|
3 years ago |
LAPTOP-CNV4CMCJ\cheng
|
e035e66ffd
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
LAPTOP-CNV4CMCJ\cheng
|
dcb3f1c8f0
|
新增订单管理页面
|
3 years ago |
luowenfeng
|
7dd12a3e81
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
YunaiV
|
e1d5cfe8fe
|
微调 trade 交易表的设计
|
3 years ago |
luowenfeng
|
20c79b7053
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
3 years ago |
YunaiV
|
356642ecea
|
review 商品的 save 界面
|
3 years ago |
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
|
3 years ago |
YunaiV
|
7bf37fcb64
|
优化管理后台的商品分页的查询
|
3 years ago |
YunaiV
|
c00ded3ed3
|
优化商品的 index 界面
|
3 years ago |
luowenfeng
|
dc4e3fcd6e
|
feature(商城): 商城review改
|
3 years ago |
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
|
3 years ago |
YunaiV
|
a13fb61359
|
优化 pom.xml 文件,减少无用的多租户引用
|
3 years ago |
luowenfeng
|
31f5b27d01
|
feature(uniapp分类): review
|
3 years ago |
huzhibo
|
66cef17fa1
|
调整前端配置管理中参数分类显示
Signed-off-by: huzhibo <527188553@qq.com>
|
4 years ago |