xingyuv
|
aba35678bc
|
Merge remote-tracking branch 'origin/master' into 1.X-dev
# Conflicts:
# yudao-ui-admin-vue3/package.json
# yudao-ui-admin-vue3/pnpm-lock.yaml
# yudao-ui-admin-vue3/src/main.ts
|
2023-02-06 09:18:48 +08:00 |
|
YunaiV
|
de7d26129c
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
|
2023-02-04 20:58:09 +08:00 |
|
xingyuv
|
bc75ad7a40
|
Merge branch 'master' into 1.X-dev
|
2023-02-04 20:26:55 +08:00 |
|
沧海
|
73d5511899
|
update README.md.
Signed-off-by: 沧海 <gentoo111@163.com>
|
2023-02-04 06:15:22 +00:00 |
|
xingyu
|
5fe0106155
|
chore: update deps
|
2023-02-01 15:53:39 +08:00 |
|
xingyu
|
08a4de37c2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
|
2023-01-30 10:08:31 +08:00 |
|
YunaiV
|
c04ef59e81
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
|
2023-01-30 08:11:24 +08:00 |
|
YunaiV
|
624b571672
|
版本 1.7.0 发布：增加微信公众号、站内信、邮箱、数据脱敏！
|
2023-01-30 08:04:58 +08:00 |
|
YunaiV
|
5d863f8742
|
版本 1.7.0 发布：增加微信公众号、站内信、邮箱、数据脱敏！
|
2023-01-30 02:31:58 +08:00 |
|
YunaiV
|
ca8bb72417
|
版本 1.7.0 发布：增加微信公众号、站内信、邮箱、数据脱敏！
|
2023-01-30 02:30:42 +08:00 |
|
YunaiV
|
f7762e646e
|
站内信模块：我的站内信 vue3
|
2023-01-29 18:31:52 +08:00 |
|
xingyu
|
ffb0358ce2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
|
2023-01-29 16:11:51 +08:00 |
|
xingyu
|
40f6fed29f
|
update: springboot 2.7.8
|
2023-01-28 09:38:03 +08:00 |
|
YunaiV
|
4cbf7398e8
|
邮箱模块：vue3 邮箱账号的管理
|
2023-01-27 15:11:11 +08:00 |
|
xingyu
|
f2adb441cd
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java
|
2023-01-18 15:39:58 +08:00 |
|
YunaiV
|
5e9706007e
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java
|
2023-01-18 00:38:55 +08:00 |
|
YunaiV
|
8208370598
|
mp：完善微信公众号的 README 说明
|
2023-01-18 00:34:38 +08:00 |
|
xingyu
|
1c0d8fc1eb
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
|
2023-01-16 14:25:03 +08:00 |
|
xingyu
|
3df825034b
|
chore: update deps
|
2023-01-12 13:58:32 +08:00 |
|
xingyu
|
d6fdd924e9
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
2023-01-04 10:58:34 +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 |
|
xingyu
|
c98965cd55
|
chore: update spring boot 2.7.7
hutool 5.8.11
mybaits-plus 3.5.3
flowable 6.8.0
|
2023-01-04 10:12:00 +08:00 |
|
xingyu
|
c6445516d8
|
docs: 更新文档版本
|
2023-01-03 17:46:32 +08:00 |
|
YunaiV
|
b7380019ba
|
完善项目 README 说明
|
2022-12-30 22:09:53 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
xingyu
|
664c6258de
|
chore: update deps
|
2022-12-22 14:15:22 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
xingyu
|
50c4fb7bfd
|
docs: 优化文档排版
|
2022-12-20 16:36:54 +08:00 |
|
xingyu
|
e78e1a9cf1
|
docs: 升级对应版本
|
2022-12-20 15:22:17 +08:00 |
|
xingyu
|
6c521fd5e0
|
chore: update deps
|
2022-12-19 22:21:36 +08:00 |
|
xingyu4j
|
6beac96b44
|
docs: update deps
|
2022-12-14 13:50:33 +08:00 |
|
xingyu
|
f936122f85
|
docs: update deps
|
2022-12-08 23:04:00 +08:00 |
|
xingyu4j
|
aa3b4bf1fa
|
增加精简版地址
|
2022-12-08 14:26:28 +08:00 |
|
xingyu
|
182c23fa1a
|
docs: 升级 springboot 2.7.6
|
2022-11-30 00:46:40 +08:00 |
|
xingyu
|
314323f1ea
|
chore: update vue 2.7.14
|
2022-11-29 23:50:39 +08:00 |
|
xingyu
|
005a3e6ab0
|
fix: bugs
|
2022-11-28 16:50:53 +08:00 |
|
xingyu
|
dec05a6c40
|
Merge remote-tracking branch 'origin/master' into feature/vue3
|
2022-11-28 14:38:43 +08:00 |
|
芋道源码
|
17c93d6a09
|
!310 update README.md. 修改错别字
Merge pull request !310 from strangeKindness/N/A
|
2022-11-27 09:12:39 +00:00 |
|
xingyu
|
7e5c44b0db
|
docs: 升级依赖
|
2022-11-26 13:20:12 +08:00 |
|
xingyu
|
82b70a18f6
|
docs: 增加说明
|
2022-11-26 13:18:49 +08:00 |
|
xingyu
|
693288d33d
|
Merge remote-tracking branch 'origin/master' into feature/vue3
# Conflicts:
# yudao-dependencies/pom.xml
|
2022-11-26 13:07:51 +08:00 |
|
YunaiV
|
2d78b02086
|
移除云片短信渠道，解决云片的安全风险
|
2022-11-25 21:04:40 +08:00 |
|
xingyu4j
|
a5287d7186
|
chore: update deps
|
2022-11-23 14:37:35 +08:00 |
|
strangeKindness
|
33c7af4492
|
update README.md. 修改错别字
Signed-off-by: strangeKindness <12070449+strangeKindness@user.noreply.gitee.com>
|
2022-11-23 01:39:12 +00:00 |
|
xingyu4j
|
8b466d6e97
|
chore: update deps
|
2022-11-23 09:31:55 +08:00 |
|
xingyu4j
|
dfb24dda81
|
chore: update
|
2022-11-21 16:09:44 +08:00 |
|
xingyu4j
|
b081bb8e71
|
chore: devs
|
2022-11-18 17:25:37 +08:00 |
|
xingyu4j
|
cbd2815c8e
|
chore: update deps
|
2022-11-15 16:54:13 +08:00 |
|
YunaiV
|
ff1379d454
|
优化 README 说明~
|
2022-11-12 18:57:41 +08:00 |
|
xingyu4j
|
33e887c07d
|
chore: update devs
|
2022-11-10 10:09:12 +08:00 |