xingyu
|
c5f29f18d3
|
Merge remote-tracking branch 'origin/master' into dev
|
2023-01-05 09:41:54 +08:00 |
|
YunaiV
|
24f0e4dd1f
|
1.6.6 发版：完善 Vue3 管理后台、新增 IP & 地区库
|
2023-01-04 22:36:38 +08:00 |
|
芋道源码
|
4c0275fbf4
|
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
|
2023-01-04 14:30:40 +00:00 |
|
gaibu
|
29d2aad176
|
fix: 上传视频无法预览
|
2023-01-04 16:33:05 +08:00 |
|
咱哥丶
|
2d1ff0aff7
|
commit 增加webSocket
|
2023-01-02 22:53:55 +08:00 |
|
YunaiV
|
6f8384af70
|
增加《敏感词》《地区 & IP》文档
|
2022-12-31 19:30:07 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
plimlips
|
2c02159384
|
update yudao-ui-admin/src/components/FileUpload/index.vue.
后台一直使用 0 作为成功，所以前端也不应该使用200
Signed-off-by: plimlips <156839224@qq.com>
|
2022-12-28 15:49:03 +00:00 |
|
芋道源码
|
258c1ddb70
|
!343 同步dev分支
Merge pull request !343 from xingyu/dev
|
2022-12-27 14:37:30 +00:00 |
|
xingyu
|
d86c36a151
|
vue2 圆角标签栏
|
2022-12-27 11:18:06 +08: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
|
1bb1da5838
|
fix: 代码生成日期类型 LocalDateTime
|
2022-12-22 15:05:49 +08:00 |
|
芋道源码
|
f9b4874ee9
|
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
|
2022-12-13 02:04:54 +00:00 |
|
YunaiV
|
4a2cb33cd7
|
product：优化商品属性值的代码
|
2022-12-12 23:40:23 +08:00 |
|
YunaiV
|
98ca807d4b
|
product：优化商品属性项的代码
|
2022-12-12 22:25:31 +08:00 |
|
YunaiV
|
7f131a3853
|
trade：增加用户 App 的订单分页和详情接口
|
2022-12-10 23:06:53 +08:00 |
|
YunaiV
|
b7d78a24a4
|
trade：完成管理后台的订单详情的简单对接
|
2022-12-10 21:02:32 +08:00 |
|
YunaiV
|
c5408965eb
|
trade：增加管理后台的订单详情接口
|
2022-12-10 17:53:44 +08:00 |
|
YunaiV
|
fc48ab4928
|
trade：前端订单管理，联调接口
|
2022-12-10 17:06:34 +08:00 |
|
YunaiV
|
fc49f000ce
|
trade：前端订单管理，联调接口
|
2022-12-10 11:52:11 +08:00 |
|
YunaiV
|
fac3e7c726
|
product：商品规格，调整成商品属性，避免和 sku 概念冲突
|
2022-12-08 21:12:35 +08:00 |
|
xingyu
|
57bfef8d24
|
修复 vue2 文字点选验证码 bug
|
2022-12-06 22:52:33 +08:00 |
|
xingyu
|
bfea385cc1
|
fix: 恢复默认端口80
|
2022-12-06 21:45:55 +08:00 |
|
xingyu
|
af0974cfb3
|
fix: import
|
2022-12-06 21:41:18 +08:00 |
|
xingyu
|
c720b1dff9
|
fix: 三方登录未携带租户
|
2022-12-06 21:30:44 +08:00 |
|
halfninety
|
6808d3c163
|
完成秒杀时段todo，秒杀时段商品添加timeIds
|
2022-12-03 15:46:26 +08:00 |
|
YunaiV
|
03c7e60092
|
发布 v1.6.5 版本！
|
2022-12-01 09:30:11 +08:00 |
|
xingyu
|
314323f1ea
|
chore: update vue 2.7.14
|
2022-11-29 23:50:39 +08:00 |
|
xingyu
|
50f96651c2
|
feat: 更换为let const
|
2022-11-29 23:26:58 +08:00 |
|
xingyu
|
b100d41da1
|
Merge remote-tracking branch 'origin/master' into feature/vue3
|
2022-11-29 23:25:39 +08:00 |
|
halfninety
|
61c4053cbb
|
前端修改秒杀相关文件存放地址
|
2022-11-29 23:25:01 +08:00 |
|
halfninety
|
54baad165d
|
秒杀时段新增修改时间段冲突校验。
秒杀活动新增，修改，删除时对秒杀时段的秒杀活动数量进行修改
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
7bc1ae5f35
|
秒杀活动增删改查
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
cd62c4d220
|
秒杀时段相关
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
ea2a57f0a0
|
修改秒杀时段id
|
2022-11-29 23:24:59 +08:00 |
|
halfninety
|
83ee1c6129
|
秒杀活动，添加商品，分页查询
|
2022-11-29 23:24:59 +08:00 |
|
YunaiV
|
53dbf8d82e
|
！290 修复三级及以上菜单路由缓存失效问题
|
2022-11-29 22:33:44 +08:00 |
|
xingyu
|
4e860eb254
|
perf: 完善类型
|
2022-11-29 22:26:50 +08:00 |
|
YunaiV
|
d884303df6
|
trade：【交易售后】查询分页列表
|
2022-11-20 09:35:06 +08:00 |
|
YunaiV
|
00e66216c5
|
trade：【交易售后】查询分页列表的前端
|
2022-11-20 01:05:03 +08:00 |
|
YunaiV
|
af71a19241
|
trade：【商品】sku 表增加 spu_name 字段，冗余
|
2022-11-19 12:25:53 +08:00 |
|
LAPTOP-CNV4CMCJ\cheng
|
b3cea2d4bf
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
2022-11-19 00:40:19 +08:00 |
|
LAPTOP-CNV4CMCJ\cheng
|
78ae018320
|
新增退款列表页 调整商品列表页的tab切换
|
2022-11-19 00:40:13 +08:00 |
|
xingyu4j
|
7083d991fe
|
refactor: verify
|
2022-11-17 10:37:23 +08:00 |
|
xingyu4j
|
042c4e8390
|
Merge remote-tracking branch 'origin/master' into feature/vue3
|
2022-11-14 09:15:19 +08:00 |
|
YunaiV
|
38d6b51fcc
|
v3.8.4:优化页面内嵌iframe切换tab不刷新数据
|
2022-11-13 19:53:59 +08:00 |
|
xingyu4j
|
89bd2f6d9e
|
Merge remote-tracking branch 'origin/master' into feature/vue3
|
2022-11-13 15:53:47 +08:00 |
|
xingyu4j
|
bdc988e5b7
|
fix: search
|
2022-11-13 13:16:21 +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 |
|