Commit Graph

672 Commits

Author SHA1 Message Date
hecan 2ae7391e65 放开测试时候注释掉的操作日志保存接口 2024-06-24 17:44:13 +08:00
hecan 6cdbd049a7 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 2024-06-24 17:42:29 +08:00
yuqh 2208514dc7 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
 Conflicts:
	pom.xml
	service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
2024-06-24 17:36:00 +08:00
hecan 422f5f4469 调整修改和新增得参数,为表名称 2024-06-24 17:33:14 +08:00
xiang2lin 4d6c7f5d03 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 16:01:05 +08:00
yuqh aedf496c2a MDM公用文件 2024-06-24 16:00:45 +08:00
xiang2lin 5a49f04d96 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 15:57:05 +08:00
yuqh 2e8baebbb1 MDM公用文件 2024-06-24 15:52:45 +08:00
hecan c5dc5449d0 根据表名称和表类型进行分组 2024-06-24 15:49:23 +08:00
xiang2lin dce61d024b Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 15:42:47 +08:00
yuqh 9b6e70ac92 Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-24 14:34:45 +08:00
yuqh 2a3a1520f7 MDM公用文件 2024-06-24 14:34:28 +08:00
lvleigang e3a6525c73 添加dm依赖 2024-06-24 14:10:59 +08:00
lvleigang 9c6996e0ca 数据源添加dm 2024-06-24 13:37:49 +08:00
lvleigang 467b162b0d Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into dev 2024-06-24 11:57:44 +08:00
lvleigang 9effdca0c8 数据源添加dm 2024-06-24 11:57:31 +08:00
lvleigang da1e4c2b35 Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 11:55:30 +08:00
lvleigang 5dfcb9037f 主数据下发,重新发送 2024-06-24 11:54:38 +08:00
yuqh 7b8ce8e35a MDM公用文件 2024-06-24 10:30:59 +08:00
yuqh 7b40d8c0dc MDM公用文件 2024-06-24 10:30:23 +08:00
hecan c2e6863913 调整通用数据保存和修改接口返回格式 2024-06-24 10:25:53 +08:00
xiang2lin 88775d3efe Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into dev 2024-06-21 18:38:57 +08:00
xiang2lin 4e42a1fcf5 cap4无流程表单导入参数 2024-06-21 18:38:28 +08:00
xiang2lin 55161cad35 查询交易明细 2024-06-21 18:36:55 +08:00
xiang2lin bf947dd50d Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 18:34:04 +08:00
xiang2lin ddaacd38fd cap4无流程表单导入参数 2024-06-21 17:55:21 +08:00
yuqh 020c7645ca Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-21 17:06:17 +08:00
yuqh 0f8ba6400d OA单据、档案 同步BIP和主数据中心 2024-06-21 17:06:04 +08:00
lvleigang e694304837 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
 Conflicts:
	buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
2024-06-21 17:02:07 +08:00
lvleigang 53000de5ae 主数据下发,重新发送 2024-06-21 17:01:11 +08:00
lvleigang 14d1532be3 主数据下发,重新发送 2024-06-21 16:47:04 +08:00
lvleigang 5840c6392b Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 16:46:19 +08:00
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