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
|
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 |
|
xiang2lin
|
85e0e26b79
|
Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai
|
2024-05-15 13:47:25 +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 |
|
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 |
|
476474485@qq.com
|
7c529a1de7
|
积木报表工具插件集成
|
2024-05-15 09:55:37 +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 |
|
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 |
|
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 |