Commit Graph
33 Commits
Author SHA1 Message Date
疯狂的狮子li 8a25343bfe update 更改版本号为开发版本 2021-12-28 15:12:06 +08:00
疯狂的狮子li a7ad72ddc7 update 回滚 fastjson 移除 后续处理 2021-12-28 15:07:43 +08:00
疯狂的狮子li 33ec29140e remove 移除 Quartz 后续集成 xxl-job 2021-12-28 15:02:18 +08:00
疯狂的狮子Li 6524f2781e !6 yml中添加jackson配置
Merge pull request !6 from 月夜/auto-5301109-master-1640673849415
2021-12-28 06:45:49 +00:00
疯狂的狮子Li e7e0bc074d !4 添加jackson配置及序列化工具类
Merge pull request !4 from 月夜/auto-5301109-master-1640661361739
2021-12-28 03:17:52 +00:00
疯狂的狮子li a57be1eab9 Merge remote-tracking branch 'ruoyi-cloud/master' 2021-12-27 11:19:01 +08:00
疯狂的狮子li cb931f4c61 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
2021-12-22 13:33:48 +08:00
疯狂的狮子li 6b0070a437 update 抽取所有公用配置到 maven profile 管理 2021-12-01 14:57:58 +08:00
疯狂的狮子li 9dd3fca1c8 update 补全 lombok 注解 2021-12-01 10:14:25 +08:00
疯狂的狮子li 5a18beaefa Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-11-29 15:41:11 +08:00
疯狂的狮子li 0265300afa Merge remote-tracking branch 'origin/master' 2021-11-17 19:43:50 +08:00
疯狂的狮子li 0036a2a60c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-11-17 19:43:12 +08:00
疯狂的狮子Li 4471118fa6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pom.xml
2021-11-14 11:14:36 +08:00
疯狂的狮子Li 86cb678c2a update hutool 5.7.1 => 5.7.16 2021-11-14 11:13:51 +08:00
疯狂的狮子Li 0a8c581a8b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
2021-11-14 10:51:04 +08:00
疯狂的狮子li b106ae0e4f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-10-29 12:40:26 +08:00
疯狂的狮子li fa0087adc0 Merge remote-tracking branch 'origin/master' 2021-10-19 17:39:40 +08:00
疯狂的狮子li dbbb26a583 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
2021-10-19 17:35:16 +08:00
疯狂的狮子Li 449a1bab44 Merge remote-tracking branch 'ruoyi-cloud/master' 2021-10-12 21:13:04 +08:00
疯狂的狮子li 96d80b9581 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-09-27 17:34:31 +08:00
疯狂的狮子li ed9c4c5d5f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
2021-09-15 10:26:03 +08:00
疯狂的狮子li f7125ed563 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-09-08 09:44:34 +08:00
疯狂的狮子li 5af38b01b3 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-09-01 12:26:26 +08:00
疯狂的狮子li 8cb344478e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-08-27 18:15:52 +08:00
疯狂的狮子li 032015d075 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
2021-08-20 14:56:54 +08:00
疯狂的狮子li 2f1fe8da87 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-08-09 12:32:07 +08:00
疯狂的狮子li 45c72e9728 update 同步ruoyi 2021-08-02 13:21:06 +08:00
疯狂的狮子li c10d4faf9d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
2021-08-02 13:18:22 +08:00
疯狂的狮子li 8059655012 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
2021-07-08 11:17:18 +08:00
疯狂的狮子li 6a64b031fa add 增加 lombok 优化原生代码 2021-06-19 00:55:38 +08:00
疯狂的狮子li 0f3aaaca0a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-06-18 16:38:40 +08:00
疯狂的狮子li 53eb607ba7 deleted 2021-06-18 16:33:08 +08:00
疯狂的狮子li 547f35bd77 init 2021-06-18 16:27:44 +08:00