Commit Graph

696 Commits

Author SHA1 Message Date
13758950345 52bfd726e3 Merge pull request 'ax' (#15) from ax into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/15
2024-04-30 09:19:09 +08:00
lvleigang 8b16af18b8 Merge branches 'ax' and 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into ax 2024-04-30 09:17:08 +08:00
lvleigang e0e6374503 澳星档案新增 2024-04-29 16:28:50 +08:00
13758950345 5f58cb436c Merge pull request '调整框架兼容mybatis-plus' (#14) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/14
2024-04-29 16:17:02 +08:00
476474485@qq.com e846a892d8 调整框架兼容mybatis-plus 2024-04-29 16:14:45 +08:00
lvleigang 0d2ac1d672 澳星档案新增 2024-04-28 15:33:49 +08:00
13758950345 baa68da51f Merge pull request 'ax' (#13) from ax into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/13
2024-04-28 10:40:57 +08:00
lvleigang b43ed7cb00 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into ax 2024-04-28 10:39:10 +08:00
lvleigang 845f6b93f2 澳星档案新增 2024-04-28 10:38:58 +08:00
13758950345 5ed5393efe Merge pull request 'lvleigang' (#12) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/12
2024-04-26 08:38:08 +08:00
lvleigang 7cc29e995d Merge branch 'lvleigang' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into ax
 Conflicts:
	service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java
2024-04-25 17:21:00 +08:00
lvleigang b6e14a894a 澳星档案新增 2024-04-25 17:20:01 +08:00
476474485@qq.com b4c6be83ff 增加平台内部接口 2024-04-25 16:39:55 +08:00
lvleigang 822de45128 澳星档案新增 2024-04-25 13:39:17 +08:00
lvleigang ed310c5802 澳星环境配置 2024-04-25 08:49:15 +08:00
lvleigang d63d2ca28b 澳星凭证 2024-04-25 08:41:38 +08:00
13758950345 d6ea257070 Merge pull request 'lvleigang' (#11) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/11
2024-04-25 08:35:48 +08:00
lvleigang 2bc4eaf2b5 修改请求打包文件名称 2024-04-24 17:52:51 +08:00
lvleigang d4f6096104 修改请求打包文件名称 2024-04-24 11:14:26 +08:00
13758950345 6bb8e96229 Merge pull request '修复lib内空的jar包导致tomcat启动失败错误' (#9) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/9
2024-04-22 16:45:31 +08:00
476474485@qq.com 63c28ad91b 修复lib内空的jar包导致tomcat启动失败错误 2024-04-22 16:42:56 +08:00
13758950345 c8ac2a6092 Merge pull request 'lvleigang' (#8) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/8
2024-04-18 16:53:40 +08:00
lvleigang 07edf76a7c 修改应用功能的文件位置 2024-04-17 15:09:02 +08:00
lvleigang 36e2554c30 修改应用功能的文件位置 2024-04-16 14:30:20 +08:00
lvleigang b3d95b57bd 修改日志文件大小 2024-04-15 09:03:15 +08:00
13758950345 373c6994b2 Merge pull request 'lvleigang' (#7) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/7
2024-04-12 13:42:19 +08:00
lvleigang 0487a71ed3 修改数据源位置 2024-04-12 11:59:01 +08:00
lvleigang 4821868a8a 日志输出修改 2024-04-12 11:55:48 +08:00
13758950345 06e9d39a2b Merge pull request '旧代码合并,页面报错修改' (#6) from changelogdatasource into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/6
2024-04-11 14:14:31 +08:00
lvleigang 0bf189797a 数据源初始化修改,日志修改 2024-04-11 14:13:03 +08:00
lvleigang fa509f09c8 旧代码合并,页面报错修改 2024-04-10 09:37:20 +08:00
13758950345 e458b4e3cf Merge pull request '旧代码合并,页面报错修改' (#5) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/5
2024-04-09 15:27:45 +08:00
lvleigang 88abe0f406 旧代码合并,页面报错修改 2024-04-09 15:26:12 +08:00
13758950345 ff20ddb4dd Merge pull request 'lvleigang' (#4) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/4
2024-04-09 11:27:07 +08:00
lvleigang d8a14add80 旧代码合并,接口权限代码编写 2024-04-09 11:23:34 +08:00
lvleigang 3943e13755 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-04-03 17:02:30 +08:00
lvleigang a4ff79ce37 系统代码上传 2024-04-03 17:02:08 +08:00
13758950345 c3472db59b Merge pull request 'lvleigang' (#3) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/3
2024-04-01 09:20:38 +08:00
lvleigang 8df34a75b7 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-04-01 09:18:32 +08:00
lvleigang 6dffbfe530 人员代码上传 2024-04-01 09:18:20 +08:00
lvleigang 05c348cc2e 代码生成XML中存在部分条件id不存在情况 2024-03-27 09:42:08 +08:00
13758950345 5e76a53980 Merge pull request '系统权限模块代码生成' (#2) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/2
2024-03-26 15:34:19 +08:00
lvleigang 71c5317711 系统权限模块代码生成 2024-03-26 15:30:20 +08:00
root 9738eb7a54 Merge pull request '项目提交' (#1) from master into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/1
2024-03-26 13:36:40 +08:00
lvleigang d57dad9774 项目提交 2024-03-26 13:34:31 +08:00
root 188e4a748d Initial commit 2024-03-26 11:10:36 +08:00