hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
508 Commits 41 Branches 0 Tags 34 MiB
Commit Graph

335 Commits

Author SHA1 Message Date
476474485@qq.com 9445cf1a46 新增groovy执行方法demo 2024-05-16 14:27:58 +08:00
xiang2lin 92a1f8bed7 seeyonExt OA同步U8 2024-05-16 14:18:21 +08:00
lvleigang 6cded58a35 Merge branches 'dev' and 'lvleigang' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-16 11:03:51 +08:00
xiang2lin e7127e581e Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-16 10:13:09 +08:00
yuqh 72ca970078 Merge pull request '日志明细公用接口调整' (#30) from yuqh into dev 
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/30
 2024-05-16 10:10:09 +08:00
yuqh 5f25e6e3d5 日志明细公用接口调整 2024-05-16 10:09:31 +08:00
yuqh 4d810e29b0 Merge pull request '日志明细公用接口调整' (#29) from yuqh into dev 
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/29
 2024-05-16 10:07:47 +08:00
yuqh 8997c78cff 日志明细公用接口调整 2024-05-16 10:06:57 +08:00
yuqh aad900a250 Merge pull request 'yuqh' (#28) from yuqh into dev 
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/28
 2024-05-16 09:44:56 +08:00
yuqh fcec924c63 日志明细公用接口调整 2024-05-16 09:43:50 +08:00
xiang2lin 0f2e8fb7b7 增加hzyaExtData字段 存放业务自定义字段 2024-05-16 08:58:25 +08:00
xiang2lin 1dec709122 日志处理 2024-05-16 08:44:50 +08:00
lvleigang 5cda40a03b 主数据上传 2024-05-16 08:43:54 +08:00
yuqh c64b37ac9c 日志明细公用接口编写 2024-05-16 08:43:26 +08:00
xiang2lin 18d4c449a9 增加hzyaExtData字段 存放业务自定义字段 2024-05-16 08:38:24 +08:00
xiang2lin 7de7fbfd71 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 16:46:13 +08:00
yuqh cceb06ceb3 日志明细公用接口编写 2024-05-15 16:40:41 +08:00
xiang2lin 9da0eee1d2 日志status枚举 2024-05-15 16:09:25 +08:00
xiang2lin ebea538f59 日志status枚举类 2024-05-15 16:01:59 +08:00
xiang2lin 8659484e9d Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 14:51:54 +08:00
lvleigang 561e69b6f5 修改表名及引用地方 2024-05-15 14:49:56 +08:00
lvleigang a201e2193a Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-15 14:46:14 +08:00
lvleigang 1f9b91cac2 修改表名及引用地方 2024-05-15 14:46:05 +08:00
xiang2lin f53def54fc Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 14:37:31 +08:00
yuqh 6eba9c09f8 代码生成 2024-05-15 14:35:18 +08:00
xiang2lin de0e98f55f Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 14:34:56 +08:00
lvleigang 74b7005879 修改表名及引用地方 2024-05-15 14:33:29 +08:00
lvleigang c227e0cae5 修改表名及引用地方 2024-05-15 14:31:08 +08:00
xiang2lin 34a736dce3 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 14:22:22 +08:00
yuqh 7e6d74cf91 代码生成 2024-05-15 14:19:09 +08:00
yuqh 22defdd0a2 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuqh 
 Conflicts:
	buildpackage/pom.xml
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java
 2024-05-15 14:17:09 +08:00
yuqh 6b67dd8a0d 代码生成 2024-05-15 14:15:04 +08:00
yuqh 3391274c9e 代码生成 2024-05-15 14:10:52 +08:00
xiang2lin 6b50b8295c Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai 2024-05-15 11:47:02 +08:00
xiang2lin 6b94b68d24 暂存 2024-05-15 11:41:21 +08:00
xiang2lin 717ad1417c 获取token接口 2024-05-15 11:39:41 +08:00
lvleigang ccfa93488c 修改表名及引用地方 2024-05-15 11:36:40 +08:00
lvleigang 9d264af585 Merge branch 'lvleigang' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into dev 2024-05-15 11:32:39 +08:00
lvleigang 9733882fab 修改表名及引用地方 2024-05-15 11:31:44 +08:00
lvleigang bd44a4d16a 修改主数据页面查询功能 2024-05-15 11:12:53 +08:00
lvleigang af9702e58b 表结构生成 2024-05-15 10:16:45 +08:00
lvleigang 73ec89af32 主数据修改，同步调整菜单表 2024-05-15 10:13:08 +08:00
xiang2lin 345994aa61 去掉没用的方法 2024-05-15 10:10:27 +08:00
xiang2lin b225c1ae16 去掉没用的方法 2024-05-15 09:21:54 +08:00
xiang2lin 6babadff9d 去掉没用的方法 2024-05-15 09:21:38 +08:00
lvleigang 7ea7351c33 Merge branch 'yingdesai' 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-05-15 08:36:59 +08:00
lvleigang 62ac8ee77b 主数据修改，同步调整菜单表 2024-05-15 08:36:08 +08:00
xiang2lin 3ed14f2310 新增callback方法 2024-05-15 08:29:45 +08:00
xiang2lin 3849532576 u8工具类 2024-05-14 16:31:58 +08:00
lvleigang 1b653ff985 首页代码拷贝到V3 2024-05-13 16:55:28 +08:00
lvleigang 43af43dd24 修改数据源 2024-05-13 13:56:24 +08:00
lvleigang 3e30cf0b59 Merge branches 'dev' and 'lvleigang' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-13 13:55:56 +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
lvleigang 4c18ebcd71 修改档案字段 2024-05-10 09:31:47 +08:00
lvleigang 30a589544c 修改主数据 2024-05-09 14:52:09 +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
lvleigang 91b9f2d0cd 澳星凭证新增接口修改适配修改、删除、作废 2024-05-09 11:54:42 +08:00
lvleigang f3a8e43aaf 主数据代码调整 2024-05-09 11:10:33 +08:00
lvleigang b7c9ddd1b7 重写任务方法，修改统一接口,修改项目启动，任务初始化方法 2024-05-08 14:47:11 +08:00
lvleigang 52bc8c26ae 重写任务方法，修改统一接口 2024-05-07 09:26:06 +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
lvleigang e0e6374503 澳星档案新增 2024-04-29 16:28:50 +08:00
lvleigang 0d2ac1d672 澳星档案新增 2024-04-28 15:33:49 +08:00
lvleigang 845f6b93f2 澳星档案新增 2024-04-28 10:38:58 +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 d63d2ca28b 澳星凭证 2024-04-25 08:41:38 +08:00
lvleigang 2bc4eaf2b5 修改请求打包文件名称 2024-04-24 17:52:51 +08:00
lvleigang d4f6096104 修改请求打包文件名称 2024-04-24 11:14:26 +08:00
lvleigang 07edf76a7c 修改应用功能的文件位置 2024-04-17 15:09:02 +08:00
lvleigang 36e2554c30 修改应用功能的文件位置 2024-04-16 14:30:20 +08:00
lvleigang 0bf189797a 数据源初始化修改，日志修改 2024-04-11 14:13:03 +08:00
lvleigang fa509f09c8 旧代码合并，页面报错修改 2024-04-10 09:37:20 +08:00
lvleigang 88abe0f406 旧代码合并，页面报错修改 2024-04-09 15:26:12 +08:00
lvleigang d8a14add80 旧代码合并，接口权限代码编写 2024-04-09 11:23:34 +08:00
lvleigang a4ff79ce37 系统代码上传 2024-04-03 17:02:08 +08:00
lvleigang 6dffbfe530 人员代码上传 2024-04-01 09:18:20 +08:00
lvleigang 05c348cc2e 代码生成XML中存在部分条件id不存在情况 2024-03-27 09:42:08 +08:00
lvleigang 71c5317711 系统权限模块代码生成 2024-03-26 15:30:20 +08:00
lvleigang d57dad9774 项目提交 2024-03-26 13:34:31 +08:00