Commit Graph

672 Commits

Author SHA1 Message Date
root 9685ccfcfd Merge pull request 'dev' (#21) from dev into ax
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/21
2024-05-11 14:52:36 +08:00
root a2a9f44f05 Merge pull request '修改dj' (#20) from ax into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/20
2024-05-11 14:46:06 +08:00
476474485@qq.com 1293b479ea Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into dev 2024-05-11 14:40:12 +08:00
476474485@qq.com 3cd0edd14f 调整日志级别,放生产服务器的时候级别调整成error,控制台不打印,只记录文件 2024-05-11 14:39:58 +08:00
476474485@qq.com 5f04f9da66 调整日志级别,放生产服务器的时候级别调整成error,控制台不打印,只记录文件 2024-05-11 14:16:58 +08:00
lvleigang 53123e9fa9 Merge branch 'ax' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-10 09:31:57 +08:00
lvleigang 4c18ebcd71 修改档案字段 2024-05-10 09:31:47 +08:00
lvleigang c05bd514a4 修改dj 2024-05-09 14:59:49 +08:00
lvleigang 30a589544c 修改主数据 2024-05-09 14:52:09 +08:00
lvleigang 18e3d55698 修改dj 2024-05-09 14:08:38 +08:00
lvleigang 9ef8124882 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-09 12:00:17 +08:00
13758950345 569b754102 Merge pull request '澳星凭证新增接口修改适配修改、删除、作废' (#19) from ax into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/19
2024-05-09 11:55:57 +08:00
lvleigang 91b9f2d0cd 澳星凭证新增接口修改适配修改、删除、作废 2024-05-09 11:54:42 +08:00
lvleigang f3a8e43aaf 主数据代码调整 2024-05-09 11:10:33 +08:00
13758950345 8441137440 Merge pull request 'lvleigang' (#18) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/18
2024-05-08 15:07:04 +08:00
lvleigang abfbf06a69 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-08 14:47:26 +08:00
lvleigang b7c9ddd1b7 重写任务方法,修改统一接口,修改项目启动,任务初始化方法 2024-05-08 14:47:11 +08:00
hecan c3384fdb38 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 2024-05-07 09:29:51 +08:00
13758950345 49efdabad0 Merge pull request '重写任务方法,修改统一接口' (#17) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/17
2024-05-07 09:27:18 +08:00
lvleigang 52bc8c26ae 重写任务方法,修改统一接口 2024-05-07 09:26:06 +08:00
hecan 0889fe0d30 调整日志输出路径 2024-05-07 09:04:40 +08:00
hecan eb781a0db1 新增配置文件 2024-05-06 15:19:33 +08:00
13758950345 72f9b363d3 Merge pull request 'lvleigang' (#16) from lvleigang into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/16
2024-04-30 10:48:25 +08:00
lvleigang be3cbbc9f8 修改转发匹配 2024-04-30 10:47:26 +08:00
lvleigang 341f620c73 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
2024-04-30 10:17:06 +08:00
lvleigang 66cc698844 修改转发匹配 2024-04-30 10:14:28 +08:00
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