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

241 Commits

Author SHA1 Message Date
xiang2lin 9c0eabf938 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 15:03:02 +08:00
xiang2lin 08b2113519 查询待支付列表 2024-06-21 09:18:24 +08:00
xiang2lin 8fe85f64df 查询交易明细 2024-06-21 09:17:56 +08:00
lvleigang c811eaa0e0 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
 2024-06-20 16:43:20 +08:00
lvleigang 353dd95a60 主数据修改 2024-06-20 16:30:37 +08:00
xiang2lin f400392f14 cbs8 2024-06-20 13:51:53 +08:00
xiang2lin 486ba7b0a8 cbs8接口 2024-06-20 13:51:22 +08:00
lvleigang 2adb827e0d Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 2024-06-20 08:43:44 +08:00
lvleigang 4e94526a30 主数据修改 2024-06-20 08:43:33 +08:00
xiang2lin b11be51018 增加达梦数据源 2024-06-19 17:55:32 +08:00
xiang2lin 026fcab189 去掉过滤条件 2024-06-19 17:51:28 +08:00
xiang2lin ed316c2cdc 增加达梦数据源 2024-06-19 17:48:14 +08:00
xiang2lin 50541f7ca5 Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-19 16:57:03 +08:00
xiang2lin f8238f9000 增加ds注解 2024-06-19 16:56:40 +08:00
yuqh c9cd5e817b Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-19 15:31:40 +08:00
yuqh a664a96cfe MDM公用文件 2024-06-19 15:31:31 +08:00
xiang2lin dd47f23b8b 代发代扣查询响应数据 2024-06-19 15:29:41 +08:00
hecan 4fefde38eb 调整金额字段 2024-06-19 15:18:53 +08:00
hecan f1fcd9658a 差旅费用报销单测试sql语句 2024-06-19 14:45:09 +08:00
xiang2lin 375e1619b0 去掉没用的引用 2024-06-19 14:36:58 +08:00
xiang2lin 442fbb602e cbs8接口 2024-06-19 13:58:05 +08:00
lvleigang 772a2e86f5 修改返回默认值 2024-06-19 11:56:42 +08:00
xiang2lin 004250f55d Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-19 11:33:29 +08:00
476474485@qq.com 2b624f5813 調整Base64.getEncoder().encodeToString(encryptedData) 2024-06-19 11:31:30 +08:00
lvleigang b595bba61b 主数据下发，重新发送 2024-06-19 10:17:03 +08:00
lvleigang 0ba8aebf25 主数据下发，重新发送 2024-06-19 10:16:47 +08:00
xiang2lin 86a977160d Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
# Conflicts:
#	buildpackage/src/test/java/com/hzya/frame/temButtom.java
#	pom.xml
#	service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java
#	webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java
 2024-06-19 10:15:33 +08:00
xiang2lin 5b19809ef0 cbs8 接口相关 2024-06-19 10:07:12 +08:00
xiang2lin 2f6f7e1755 cbs8接口 2024-06-19 10:06:03 +08:00
xiang2lin 351ed98ab4 cbs8接口 2024-06-19 10:05:15 +08:00
476474485@qq.com f645cb96db 增加byte数组参数 2024-06-19 10:03:46 +08:00
476474485@qq.com 7fa07577f0 增加转发接口支持byteBodys 2024-06-19 09:54:19 +08:00
476474485@qq.com b11706fb4e Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into guojh 2024-06-19 09:02:12 +08:00
xiang2lin bc2290c9a0 seeyon 2024-06-18 18:02:13 +08:00
lvleigang 2d4b3af64c 主数据下发，重新发送 2024-06-18 17:17:11 +08:00
lvleigang 70a7fe3ff2 Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
 2024-06-18 16:31:02 +08:00
lvleigang db50cf0c1a 主数据下发，重新发送 2024-06-18 16:29:47 +08:00
xiang2lin a60e6675b6 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-18 11:17:01 +08:00
476474485@qq.com 37d45b8ab0 添加脚本语言groovydemo 2024-06-18 11:08:43 +08:00
xiang2lin 3fffae8d3c 增加 apiUrl字段 2024-06-18 11:00:52 +08:00
xiang2lin e0efefc522 entity_get方法增加interfaceAddress字段 2024-06-18 10:21:52 +08:00
xiang2lin 6af94ef32c cbs8接口 2024-06-18 09:17:34 +08:00
476474485@qq.com 80d870073f Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into guojh 
 Conflicts:
	service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java
	service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
	service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
	service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
	service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java
	service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
 2024-06-18 08:59:05 +08:00
yuqh 71c69c4c9c Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-17 14:17:18 +08:00
xiang2lin 6e380bb0d5 cbs8 相关 2024-06-17 13:54:31 +08:00
xiang2lin 673885c091 cbs8 sm2工具类、支付状态枚举类 2024-06-17 13:54:06 +08:00
xiang2lin 1b2c85402d 请求参数实体类 2024-06-17 13:52:55 +08:00
xiang2lin c767923d87 cbs8 工具类 2024-06-17 13:45:49 +08:00
xiang2lin 1f353a3405 cbs8 token工具类 2024-06-17 13:45:37 +08:00
xiang2lin 6c48ee967b oa集成cbs 2024-06-17 13:41:57 +08:00