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
|
3 years ago |
芋道源码
|
427d031ba5
|
!346 file路径Bug
Merge pull request !346 from 与或非/issues/I5KG6T
|
3 years ago |
|
xingyu
|
df8a0768ea
|
feat: vue3 代码生成
|
3 years ago |
gaibu
|
906a3a2c50
|
fix: 重复 file 路径 Bug
|
3 years ago |
|
gaibu
|
639c7820f9
|
fix: 重复 file 路径 Bug
|
3 years ago |
|
gaibu
|
9a46860086
|
fix: 重复 file 路径 Bug
|
3 years ago |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
3 years ago |
|
YunaiV
|
3443aa6f5f
|
优化本地缓存的刷新实现，数据变更时，强制刷新
|
3 years ago |
|
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
|
3 years ago |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
3 years ago |
|
xingyu
|
4f2c08f8db
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
3 years ago |
|
xingyu
|
9de323e09c
|
perf: 完善上传组件
|
3 years ago |
|
xingyu
|
85e9a17569
|
fix: 字典类型代码生成
|
3 years ago |
supine-win
|
bed94aa341
|
update codegen/java/controller/vo/respVO.vm.
是不是缺少break
Signed-off-by: supine-win <supine.win@gmail.com>
|
3 years ago |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
3 years ago |
|
xingyu4j
|
19c193cc1a
|
fix: vue3 代码生成
|
3 years ago |
|
xingyu4j
|
0a805483a9
|
代码生成 localDateTime 处理
|
3 years ago |
|
xingyu4j
|
623f7124c6
|
fix: vue3 代码生成类型
|
3 years ago |
|
xingyu
|
b46ac885d4
|
fix: 时间格式提交问题
|
3 years ago |
|
xingyu
|
731e49d7b6
|
feat: add upload component
|
3 years ago |
|
xingyu
|
ba6a2957fc
|
fix: vue3 代码生成 bugs
|
3 years ago |
|
xingyu4j
|
1bdde35dc9
|
fix: codegen
|
3 years ago |
|
xingyu4j
|
4b5d15c05b
|
fix: vue3 代码生成缺失日期格式化
|
3 years ago |
|
xingyu4j
|
24439b70ea
|
perf: vue3 代码生成
|
3 years ago |
|
xingyu4j
|
a43b884c73
|
fix: warn
|
3 years ago |
|
芋道源码
|
44249e43dd
|
!313 修复上传七牛云无mime type问题
Merge pull request !313 from 石溪/master
|
3 years ago |
石溪
|
7f9fc41555
|
修复上传七牛云无mime type问题
|
3 years ago |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
3 years ago |
|
xingyu
|
824c54088b
|
perf: add view name
|
3 years ago |
|
xingyu4j
|
886bc6eacd
|
feat: vxe codegen
|
3 years ago |
|
YunaiV
|
35528e8267
|
trade：【交易售后】查询分页列表
|
3 years ago |
|
xingyu4j
|
f606bfb12b
|
fix: inputnumber
|
3 years ago |
|
xingyu4j
|
4d7ac3ebc8
|
fix: dict
|
3 years ago |
|
xingyu4j
|
6360d43274
|
fix: codegen
|
3 years ago |
|
xingyu4j
|
47f3c560fa
|
feat: vue3 codegen
|
3 years ago |
|
YunaiV
|
c5b547e0f3
|
优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度
|
3 years ago |
|
YunaiV
|
92ace031fe
|
【修复】访问数据库存储的文件，path 多层级时，无法访问的问题
|
3 years ago |
|
YunaiV
|
e757d17202
|
【修复】swagger上传文件没有 file 参数
|
3 years ago |
|
YunaiV
|
3cd256f7f2
|
【修复】跨部门审核，当申请人与审批人不在同一部门，并且审批人的数据权限为“本部门数据权限”时，审批时有异常“手机号不存在”
|
3 years ago |
|
YunaiV
|
a8cdf74120
|
【移除】Apollo 配置中心，简化学习成本
|
3 years ago |
|
YunaiV
|
ce3aefadd7
|
移除 jasypt-spring-boot-starter 依赖，使用 hutool AES 替代
|
3 years ago |
|
芋道源码
|
fb237423b8
|
!294 修复单元测试报错
Merge pull request !294 from 芋道源码/dev
|
3 years ago |
|
YunaiV
|
cb4224af12
|
1. 修复 FileServiceTest 单元测试
2. 修复 FileConfigServiceImplTest 单元测试
|
3 years ago |
|
芋道源码
|
15dd67d647
|
!287 fix:（同步失败，不存在改变）代码生成，修改字段注解都不能修改
Merge pull request !287 from halfninety/master
|
3 years ago |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
3 years ago |
|
xingyu4j
|
2c1419fb1a
|
vue3 代码生成
|
3 years ago |
|
xingyu4j
|
0f40947721
|
升级部分依赖
|
3 years ago |
|
xingyu4j
|
b5a4a5446e
|
fix: vue3 代码生成错误
|
3 years ago |
huyuehua
|
38161f05ac
|
fix:（同步失败，不存在改变）代码生成，修改字段注解都不能修改
https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I5WP5M
|
3 years ago |
jueying
|
faea04546e
|
修复代码生成父菜单选择无效，前端代码缺少字段，格式错误
|
3 years ago |