shizhong
|
55358aa170
|
租户添加或修改时租户名称改为不可以重复，否则会造成重复名称的租户无法正常登录的问题
|
2023-03-30 16:00:25 +08:00 |
|
shizhong
|
b8628f75c5
|
解决新增租户时创建的租户第一个用户性别为无效值0的问题
|
2023-03-30 15:19:20 +08:00 |
|
打听幸福的下落
|
aae6f12832
|
fix: MybatisPlus 主键策略使用雪花算法 ASSIGN_ID 时，获取登录验证码主键精度丢失问题
SmsCodeDO 主键类型为 Integer，使用雪花算法后 Long 转 Integer 精度丢失，system_sms_code 表数据入库后主键为负数
|
2023-03-16 20:25:29 +08:00 |
|
joinfriend
|
ede7aabb55
|
补充update分隔符
Signed-off-by: joinfriend <277784977@163.com>
|
2023-03-07 17:25:00 +00:00 |
|
芋道源码
|
6216b1190a
|
!416 用户详情不显示所属部门部门
Merge pull request !416 from babylazsss/master
|
2023-02-28 16:51:59 +00:00 |
|
jian.li
|
c35d4f596a
|
缓存部门命名优化
|
2023-02-24 13:13:10 +08:00 |
|
chiwenda
|
5f47c00c51
|
fix:用户详情不显示所属部门
|
2023-02-20 22:05:28 +08:00 |
|
YunaiV
|
35ba9b36af
|
菜单新增 alwaysShow 总是展示、componentName 组件名
|
2023-02-10 23:03:10 +08:00 |
|
YunaiV
|
c3eb9022b8
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-server/pom.xml
|
2023-02-04 10:21:45 +08:00 |
|
YunaiV
|
b5b23b3d7c
|
infra：完善 config 的单元测试
|
2023-02-04 00:57:09 +08:00 |
|
YunaiV
|
10f7352ef8
|
system：简化 mapper 的实现
|
2023-02-04 00:33:55 +08:00 |
|
YunaiV
|
67e1879a8f
|
system：将 biz 的方法名的负数都换成 List
|
2023-02-04 00:26:48 +08:00 |
|
YunaiV
|
837345ed95
|
system：将 api 的方法名的负数都换成 List
|
2023-02-04 00:15:20 +08:00 |
|
YunaiV
|
245e557309
|
system：将 check 方法，统一成 validate 方法
|
2023-02-04 00:10:12 +08:00 |
|
YunaiV
|
2ba4dec0da
|
完善 notify 单元测试
|
2023-02-04 00:02:37 +08:00 |
|
YunaiV
|
62dc3296d6
|
完善 mail 单元测试
|
2023-02-03 23:39:47 +08:00 |
|
YunaiV
|
3d3c88dd4f
|
完善 AdminUserServiceImpl 单元测试
|
2023-02-03 22:10:05 +08:00 |
|
YunaiV
|
1d3ca8a990
|
完善 TenantServiceImpl 单元测试
|
2023-02-02 23:47:17 +08:00 |
|
YunaiV
|
83003021e1
|
完善 TenantPackageServiceImpl 单元测试
|
2023-02-02 23:35:56 +08:00 |
|
YunaiV
|
d897f8fb10
|
完善 SmsCodeServiceImpl 单元测试
|
2023-02-02 23:16:35 +08:00 |
|
YunaiV
|
a332d5f893
|
完善 SmsSendServiceImpl 单元测试
|
2023-02-02 21:15:23 +08:00 |
|
YunaiV
|
97fd7a7187
|
完善 SmsChannelServiceImpl 单元测试
|
2023-02-02 21:05:58 +08:00 |
|
YunaiV
|
d7f86afd6c
|
完善 SensitiveWordServiceImpl 单元测试
|
2023-02-02 21:03:25 +08:00 |
|
YunaiV
|
96e8fa4216
|
完善 RoleServiceImpl 单元测试
|
2023-02-02 09:13:14 +08:00 |
|
YunaiV
|
3aeebef036
|
完善 MenuServiceImplTest 单元测试
|
2023-02-01 23:33:59 +08:00 |
|
YunaiV
|
7731b4f503
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai
|
2023-02-01 21:09:29 +08:00 |
|
YunaiV
|
96e8df0398
|
完善 NoticeServiceImpl 单元测试
|
2023-02-01 21:04:18 +08:00 |
|
YunaiV
|
aa37c2cd7c
|
完善 OperateLogServiceImpl 单元测试
|
2023-02-01 08:27:02 +08:00 |
|
YunaiV
|
9ca793919d
|
完善 ErrorCodeServiceImpl 单元测试
|
2023-02-01 08:04:36 +08:00 |
|
YunaiV
|
fed9feb05f
|
完善 DictTypeServiceImpl 单元测试
|
2023-02-01 07:45:57 +08:00 |
|
YunaiV
|
0537421655
|
完善 DictDataServiceImpl 单元测试
|
2023-02-01 07:34:57 +08:00 |
|
YunaiV
|
bef06ef940
|
完善 PostServiceImpl 单元测试
|
2023-02-01 00:42:38 +08:00 |
|
YunaiV
|
1011de3278
|
完善 DeptServiceImpl 单元测试
|
2023-02-01 00:07:34 +08:00 |
|
YunaiV
|
ba78d9964a
|
完善 AdminAuthServiceImpl 单元测试
|
2023-01-31 22:43:50 +08:00 |
|
xingyu
|
fa2977ae9e
|
适配springdoc
|
2023-01-30 10:24:29 +08:00 |
|
xingyu
|
08a4de37c2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
|
2023-01-30 10:08:31 +08:00 |
|
xingyu
|
edbbb1a50a
|
feat: mail springdoc
|
2023-01-29 16:24:24 +08:00 |
|
xingyu
|
ffb0358ce2
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
|
2023-01-29 16:11:51 +08:00 |
|
YunaiV
|
1943e71e3f
|
站内信模块：完善注释
|
2023-01-28 22:59:01 +08:00 |
|
YunaiV
|
ae3ee95cdd
|
站内信模块：整体功能实现
|
2023-01-28 20:10:19 +08:00 |
|
YunaiV
|
143035d798
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/notify
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
# yudao-ui-admin/src/utils/dict.js
|
2023-01-27 23:25:08 +08:00 |
|
YunaiV
|
7e65ede92d
|
邮箱模块：优化注释 + 方法名
|
2023-01-27 21:31:30 +08:00 |
|
YunaiV
|
28ba9a7456
|
邮箱模块：vue3 邮件日志的管理
|
2023-01-27 20:51:52 +08:00 |
|
YunaiV
|
5d1abd5f44
|
邮箱模块：完善 send 的单元测试
|
2023-01-27 10:14:15 +08:00 |
|
YunaiV
|
f0d2c7a58a
|
邮箱模块：完善 log 的单元测试
|
2023-01-27 09:38:42 +08:00 |
|
YunaiV
|
c0b029b244
|
邮箱模块：完善 template 的单元测试
|
2023-01-26 23:32:18 +08:00 |
|
YunaiV
|
0895ee7d98
|
邮箱模块：完善 account 的单元测试
|
2023-01-26 23:04:26 +08:00 |
|
YunaiV
|
525078abd3
|
邮箱模块：完善 log 相关的逻辑
|
2023-01-26 20:39:38 +08:00 |
|
YunaiV
|
f9ab45df18
|
邮箱模块：完善 log 相关表结构
|
2023-01-26 01:57:57 +08:00 |
|
YunaiV
|
afced9d420
|
邮箱模块：完善发送 send 逻辑
|
2023-01-25 21:32:32 +08:00 |
|
YunaiV
|
ea39dcc5c8
|
邮箱模块：完善 template 模版的增删改查功能
|
2023-01-25 20:44:48 +08:00 |
|
YunaiV
|
0262fa5c15
|
邮箱模块：完善 account 账号的增删改查功能
|
2023-01-25 17:48:09 +08:00 |
|
YunaiV
|
c9c5a818ec
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1
|
2023-01-25 12:40:37 +08:00 |
|
YunaiV
|
c744e115e3
|
简化本地缓存的实现，萌新更容易看懂！
|
2023-01-25 10:11:16 +08:00 |
|
YunaiV
|
711a39b8e9
|
spring doc：增加模块分组
|
2023-01-19 15:03:46 +08:00 |
|
芋道源码
|
2a332a95f9
|
!376 重构 滑块验证码实现 vue3 自动引入
Merge pull request !376 from xingyu/dev
|
2023-01-19 01:24:20 +00: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 |
|
xingyu
|
13afc3d57a
|
feat: springdoc
|
2023-01-17 21:25:06 +08:00 |
|
xingyu
|
0ef05fba7c
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
|
2023-01-17 21:18:53 +08:00 |
|
xingyu
|
e314a63ee9
|
feat: springdoc 代码生成适配
|
2023-01-17 21:18:10 +08:00 |
|
xingyu
|
8c4bc638a4
|
chore: captcha-plus
|
2023-01-17 16:57:10 +08:00 |
|
xingyu
|
cba69e94df
|
revert: file
|
2023-01-16 15:15:31 +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
|
860b0301b7
|
refactor: captcha-plus
|
2023-01-16 11:12:30 +08:00 |
|
xingyu
|
fffe3008b5
|
refactor: captcha-plus
|
2023-01-16 10:47:39 +08:00 |
|
xingyu
|
aaf62982e2
|
feat: 优化 captcha 代码
|
2023-01-12 21:51:53 +08:00 |
|
YunaiV
|
d6de233a47
|
mp：完成公众号的数据统计前端界面
|
2023-01-08 00:36:25 +08:00 |
|
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 |
|
YunaiV
|
7912a54ebd
|
【修复】没有数据权限时，添加/修改用户的唯一手机、账号等字段的校验不正确
|
2022-12-31 17:31:06 +08:00 |
|
芋道源码
|
8690f2dddd
|
!341 修改注释中的错别字
Merge pull request !341 from 王添翼/master
|
2022-12-29 12:20:56 +00:00 |
|
YunaiV
|
1aee4ad00f
|
【修复】DeptService 的 getDeptsByParentIdFromCache 在获取部门列表时，未处理多租户场景
|
2022-12-29 20:18:59 +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
|
3443aa6f5f
|
优化本地缓存的刷新实现，数据变更时，强制刷新
|
2022-12-29 00:09:58 +08:00 |
|
芋道源码
|
30a4d7d954
|
!342 同步最新版本的商城进度
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
|
2022-12-27 13:39:56 +00: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 |
|
YunaiV
|
9a5c8a11f5
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
# yudao-module-system/yudao-module-system-biz/pom.xml
|
2022-12-23 19:38:00 +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 |
|
YunaiV
|
491921d5ae
|
code review 站内信代码
|
2022-12-23 18:41:41 +08:00 |
|
xingyu
|
c8f4ba66d1
|
fix: 部门更新 log 错误
|
2022-12-23 16:23:40 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
xingyu
|
4f2c08f8db
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
2022-12-21 22:46:52 +08:00 |
|
luowenfeng
|
ed2d195411
|
站内信开发
|
2022-12-17 16:42:40 +08:00 |
|
luowenfeng
|
826a564abd
|
站内信开发
|
2022-12-17 16:41:14 +08:00 |
|
YunaiV
|
7f131a3853
|
trade：增加用户 App 的订单分页和详情接口
|
2022-12-10 23:06:53 +08:00 |
|
gaibu
|
a5ec334e53
|
fix: 逻辑删除唯一索引冲突的问题
|
2022-12-10 12:02:49 +08:00 |
|
gaibu
|
9e3ed75772
|
fix: 逻辑删除唯一索引冲突的问题
|
2022-12-10 11:59:21 +08:00 |
|
gaibu
|
67435648b2
|
fix: 逻辑删除唯一索引冲突的问题
|
2022-12-10 11:32:46 +08:00 |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
2022-12-09 13:43:15 +08:00 |
|
YunaiV
|
ffab0b1d6a
|
1. 优化 menu 本地缓存的刷新策略，在修改或删除菜单时，强制刷新缓存
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出，避免一直打印
|
2022-12-06 20:38:05 +08:00 |
|
xingyu4j
|
a43b884c73
|
fix: warn
|
2022-11-30 10:30:58 +08:00 |
|
YunaiV
|
ea95115ffd
|
移除云片短信渠道，解决云片的安全风险
|
2022-11-25 20:22:04 +08:00 |
|
luowenfeng
|
f77522980f
|
fix(站内信功能调整): 接口fix
|
2022-11-23 12:26:51 +08:00 |
|
YunaiV
|
e8dd66c6f8
|
review 部分站内信的实现
|
2022-11-21 13:01:16 +08:00 |
|
YunaiV
|
131adad9c0
|
review 部分站内信的实现
|
2022-11-21 11:52:55 +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 |
|
YunaiV
|
c5b547e0f3
|
优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度
|
2022-11-12 20:22:09 +08:00 |
|