 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 |
|
yuqh
|
c64b37ac9c
|
日志明细公用接口编写
|
2024-05-16 08:43:26 +08:00 |
|
yuqh
|
5de0d86902
|
Merge pull request 'yuqh' (#27) from yuqh into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/27
|
2024-05-15 16:43:53 +08:00 |
|
yuqh
|
cceb06ceb3
|
日志明细公用接口编写
|
2024-05-15 16:40:41 +08:00 |
|
yuqh
|
3231a6c49b
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuqh
|
2024-05-15 16:40:16 +08:00 |
|
xiang2lin
|
9da0eee1d2
|
日志status枚举
|
2024-05-15 16:09:25 +08:00 |
|
xiang2lin
|
5d002e8472
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into dev
# Conflicts:
# buildpackage/src/main/resources/application.yml
|
2024-05-15 15:28:33 +08:00 |
|
xiang2lin
|
c380b5b6dd
|
增加ax.url配置
|
2024-05-15 15:23:23 +08:00 |
|
yuqh
|
c618193df3
|
Merge branches 'dev' and 'yuqh' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuqh
|
2024-05-15 14:51:14 +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 |
|
yuqh
|
f2aa1a377e
|
Merge pull request 'dev' (#25) from dev into yuqh
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/25
|
2024-05-15 14:36:29 +08:00 |
|
yuqh
|
6eba9c09f8
|
代码生成
|
2024-05-15 14:35:18 +08:00 |
|
lvleigang
|
74b7005879
|
修改表名及引用地方
|
2024-05-15 14:33:29 +08:00 |
|
lvleigang
|
c227e0cae5
|
修改表名及引用地方
|
2024-05-15 14:31:08 +08:00 |
|
yuqh
|
8a1114bb35
|
Merge pull request 'yuqh' (#24) from yuqh into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/24
|
2024-05-15 14:21:21 +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
|
fe4aea7112
|
代码生成
|
2024-05-15 14:15:26 +08:00 |
|
yuqh
|
6b67dd8a0d
|
代码生成
|
2024-05-15 14:15:04 +08:00 |
|
yuqh
|
3391274c9e
|
代码生成
|
2024-05-15 14:10:52 +08:00 |
 xiaoguo001
|
845b1b15d2
|
Merge pull request 'guojh' (#23) from guojh into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/23
|
2024-05-15 13:43:31 +08:00 |
476474485@qq.com
|
fd094d7374
|
新增积木报表包扫描
|
2024-05-15 13:40:18 +08:00 |
|
476474485@qq.com
|
38b7482878
|
Merge remote-tracking branch 'origin/guojh' into guojh
|
2024-05-15 11:55:23 +08:00 |
|
476474485@qq.com
|
f148832b67
|
增加积木报表配置
|
2024-05-15 11:55:08 +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 |
|
476474485@qq.com
|
7c529a1de7
|
积木报表工具插件集成
|
2024-05-15 09:55:37 +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 |
|
xiang2lin
|
5b507de06d
|
主配置文件 增加ax.url配置
|
2024-05-14 11:22:16 +08:00 |
|
lvleigang
|
1b653ff985
|
首页代码拷贝到V3
|
2024-05-13 16:55:28 +08:00 |
|
xiang2lin
|
442a5bccf5
|
个人配置
|
2024-05-13 16:45:03 +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 |
root
|
a75a957852
|
Merge pull request 'Merge pull request 'dev' (#21) from dev into ax' (#22) from ax into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/22
|
2024-05-11 14:56:48 +08:00 |
|
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 |