Commit Graph

16 Commits

Author SHA1 Message Date
yuqh 740c31fe5c Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into kjs
# Conflicts:
#	buildpackage/pom.xml
#	buildpackage/src/main/resources/application-dongj.yml
#	buildpackage/src/main/resources/application-kjs.yml
#	buildpackage/src/test/java/com/hzya/frame/temButtom.java
#	pom.xml
#	service/src/main/java/com/hzya/frame/dingtalk/service/IDingTalkService.java
#	service/src/main/java/com/hzya/frame/dingtalk/service/impl/DingTalkServiceImpl.java
#	service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
#	service/src/main/java/com/hzya/frame/sysnew/grovy/service/impl/GroovyIntegrationServiceImpl.java
#	webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java
2024-11-05 15:06:07 +08:00
xiang2lin b5564c592a 打印脚本入参
2024年9月4日11:04:51
2024-09-04 11:04:58 +08:00
yuqh 8ece0ab087 1 2024-08-06 15:43:39 +08:00
lvleigang 2ad4ff5be5 系统添加不加在数据库操作 2024-07-09 15:30:27 +08:00
yuqh 5b8c6087f2 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-17 11:24:45 +08:00
lvleigang e223dbd22d 主数据修改 2024-06-13 11:01:35 +08:00
lvleigang 22b32ce6dc Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-11 09:56:48 +08:00
hecan e94581d805 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan
# Conflicts:
#	service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
2024-06-05 11:49:25 +08:00
hecan 42a6ed3086 调整通用数据 2024-06-05 11:46:51 +08:00
lvleigang 303e4f1340 修改适配达梦数据源 2024-05-31 16:45:13 +08:00
476474485@qq.com 9445cf1a46 新增groovy执行方法demo 2024-05-16 14:27:58 +08:00
lvleigang 0bf189797a 数据源初始化修改,日志修改 2024-04-11 14:13:03 +08:00
lvleigang d8a14add80 旧代码合并,接口权限代码编写 2024-04-09 11:23:34 +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 d57dad9774 项目提交 2024-03-26 13:34:31 +08:00