xingyu
|
854ba3315c
|
marge master
|
2023-01-04 10:57:19 +08:00 |
|
xingyu
|
7b98a3f3f3
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.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/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.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/controller/app/order/vo/AppTradeOrderPageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
# yudao-server/pom.xml
# yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
|
2023-01-04 10:48:18 +08:00 |
|
芋道源码
|
427d031ba5
|
!346 file路径Bug
Merge pull request !346 from 与或非/issues/I5KG6T
|
2023-01-04 01:19:37 +00:00 |
|
芋道源码
|
2b87f6a59d
|
!347 fix: 腾讯 COS 异常，Region 必传
Merge pull request !347 from 与或非/issues/I5N76T
|
2023-01-04 01:00:16 +00:00 |
|
芋道源码
|
135ee3f39d
|
!349 vue3 XTable 组件
Merge pull request !349 from xingyu/dev
|
2023-01-04 00:56:44 +00:00 |
|
xingyu
|
377bc5048e
|
docs: 更新文档版本
|
2023-01-03 17:50:13 +08:00 |
|
xingyu
|
c6445516d8
|
docs: 更新文档版本
|
2023-01-03 17:46:32 +08:00 |
|
xingyu
|
8488933ec4
|
refactor: Xtable
|
2023-01-03 16:35:07 +08:00 |
|
xingyu
|
f2d2dc4d9e
|
perf: XTable hooks
|
2023-01-03 14:23:48 +08:00 |
|
xingyu
|
df8a0768ea
|
feat: vue3 代码生成
|
2023-01-03 11:23:41 +08:00 |
|
xingyu
|
f352c4d941
|
reactor: 重构 XTable
|
2023-01-03 11:21:27 +08:00 |
|
xingyu
|
a984eac965
|
feat: 完善xtable组件
|
2023-01-03 10:40:53 +08:00 |
|
xingyu
|
a74c6b0805
|
chore: update deps
|
2023-01-03 10:11:13 +08:00 |
|
xingyu
|
f831b43dec
|
feat: 封装xTable 组件
|
2023-01-03 10:10:51 +08:00 |
|
gaibu
|
2fea3a8e83
|
fix: 腾讯 COS 异常，Region 必传
|
2023-01-02 22:31:15 +08:00 |
|
gaibu
|
906a3a2c50
|
fix: 重复 file 路径 Bug
|
2023-01-02 12:27:52 +08:00 |
|
YunaiV
|
6f8384af70
|
增加《敏感词》《地区 & IP》文档
|
2022-12-31 19:30:07 +08:00 |
|
YunaiV
|
7912a54ebd
|
【修复】没有数据权限时，添加/修改用户的唯一手机、账号等字段的校验不正确
|
2022-12-31 17:31:06 +08:00 |
|
YunaiV
|
b7380019ba
|
完善项目 README 说明
|
2022-12-30 22:09:53 +08:00 |
|
gaibu
|
639c7820f9
|
fix: 重复 file 路径 Bug
|
2022-12-30 16:07:53 +08:00 |
|
gaibu
|
9a46860086
|
fix: 重复 file 路径 Bug
|
2022-12-30 15:04:28 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
芋道源码
|
f469c5caaf
|
!332 redis mq消息丢失问题
Merge pull request !332 from 与或非/issues/I5RFO2
|
2022-12-29 12:27:38 +00:00 |
|
芋道源码
|
75b3a297ce
|
!344 update yudao-ui-admin/src/components/FileUpload/index.vue.
Merge pull request !344 from plimlips/N/A
|
2022-12-29 12:22:42 +00:00 |
|
芋道源码
|
8690f2dddd
|
!341 修改注释中的错别字
Merge pull request !341 from 王添翼/master
|
2022-12-29 12:20:56 +00:00 |
|
芋道源码
|
e646386603
|
!326 fix typo in uni-swiper-dot.vue
Merge pull request !326 from Ikko Ashimine/N/A
|
2022-12-29 12:20:27 +00:00 |
|
YunaiV
|
1aee4ad00f
|
【修复】DeptService 的 getDeptsByParentIdFromCache 在获取部门列表时，未处理多租户场景
|
2022-12-29 20:18:59 +08:00 |
|
YunaiV
|
ac3c751132
|
329 修改支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）
|
2022-12-29 18:56:55 +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 |
|
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 |
|
gaibu
|
604266d33c
|
fix: 解决 redis mq 消息丢失问题
|
2022-12-27 22:52:19 +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 |
|
王添翼
|
84b0f33944
|
update yudao-module-system-biz/system/controller/admin/user/UserController.java.
修改注释中的错别字“ // 获用户门列表，只要开启状态的”改为“ // 获取用户列表，只要开启状态的”
Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
|
2022-12-25 13:16:38 +00: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 |
|