Commit Graph

640 Commits

Author SHA1 Message Date
lvleigang 37cbcfb620 Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 16:45:59 +08:00
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
yuqh 6b0120eb23 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 14:01:51 +08:00
hecan e1adda59ae 客户档案插件以及明细插件 2024-06-21 13:59:12 +08:00
hecan 6b39d8b54d 去掉明细得操作保存日志 2024-06-21 11:41:18 +08:00
hecan 8ab6b88fb0 调整通用数据查询返回格式 2024-06-21 11:37:24 +08:00
yuqh 6145dcbf3c Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 10:27:22 +08:00
hecan d4b2ff16ff 调整通用数据查询,查询子表 2024-06-21 10:26:50 +08:00
yuqh 0223fd56e5 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 09:31:37 +08:00
yuqh 06cb8e5a4d Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-21 09:31:16 +08:00
hecan 299ba86d60 调整代码,子表不新增操作日志 2024-06-21 09:29:09 +08:00
xiang2lin a4758ac2a4 cbs测试 2024-06-21 09:18:56 +08:00
xiang2lin 08b2113519 查询待支付列表 2024-06-21 09:18:24 +08:00
xiang2lin 8fe85f64df 查询交易明细 2024-06-21 09:17:56 +08:00
xiang2lin 6b19e593f6 查询交易明细 2024-06-21 09:15:46 +08:00
xiang2lin 3cc0acb065 查询交易明细 2024-06-21 09:15:29 +08:00
lvleigang 977320833f Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
 Conflicts:
	buildpackage/src/main/resources/application-llg.yml
2024-06-20 17:16:40 +08:00
lvleigang c6d4f8ad3a 修改澳星url的名称,所有项目都可以使用 2024-06-20 17:15:15 +08:00
lvleigang 8e042a925a 主数据修改 2024-06-20 17:12:16 +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 70e3bdd4a6 插件测试 2024-06-20 14:38:38 +08:00
xiang2lin e699ffa37f 测试 2024-06-20 14:00:40 +08:00
xiang2lin 6a2691ff69 cbs8交易日志查询 2024-06-20 14:00:23 +08:00
xiang2lin 48186afb82 测试方法 2024-06-20 13:56:18 +08:00
xiang2lin f400392f14 cbs8 2024-06-20 13:51:53 +08:00
xiang2lin 486ba7b0a8 cbs8接口 2024-06-20 13:51:22 +08:00
xiang2lin 907a5f057f cbs8 插件 2024-06-20 13:51:04 +08:00
yuqh e23ca7ef21 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-20 10:21:44 +08:00
xiang2lin 89e2f4326c cbs8 插件 2024-06-20 09:07:18 +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 20091505d8 测试类 2024-06-19 17:52:32 +08:00
xiang2lin 026fcab189 去掉过滤条件 2024-06-19 17:51:28 +08:00
xiang2lin ed316c2cdc 增加达梦数据源 2024-06-19 17:48:14 +08:00
xiang2lin d2a97cd7ad 测试类 2024-06-19 17:02:09 +08:00
xiang2lin 0ca5c75a1a cbs8 插件 2024-06-19 17:01:54 +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
xiang2lin 642986b94a cbs8 插件 2024-06-19 16:56:21 +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
xiang2lin e4d0f19e02 cbs8插件 2024-06-19 13:47:44 +08:00
lvleigang 772a2e86f5 修改返回默认值 2024-06-19 11:56:42 +08:00