Commit Graph

83 Commits

Author SHA1 Message Date
lvleigang c333f3f84f 修改适配达梦 2024-06-28 14:00:52 +08:00
yuqh 197c7620c5 MDM公用文件 2024-06-28 09:10:29 +08:00
xiang2lin 466a89e1c4 电子回单临时文件 2024-06-26 15:44:58 +08:00
xiang2lin 6e77825ce2 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-26 15:44:34 +08:00
476474485@qq.com 671ec5475e 增加tlog配置
https://tlog.yomahub.com/pages/5b7bd2/
2024-06-26 09:11:01 +08:00
xiang2lin 5991883e53 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-25 16:46:46 +08:00
yuqh ef065c3f8c MDM公用文件 2024-06-25 14:08:07 +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
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
lvleigang 9c6996e0ca 数据源添加dm 2024-06-24 13:37:49 +08:00
yuqh 7b8ce8e35a MDM公用文件 2024-06-24 10:30:59 +08:00
yuqh 7b40d8c0dc MDM公用文件 2024-06-24 10:30:23 +08:00
xiang2lin 55161cad35 查询交易明细 2024-06-21 18:36:55 +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 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
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
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
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
xiang2lin 0ca5c75a1a cbs8 插件 2024-06-19 17:01:54 +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
lvleigang db50cf0c1a 主数据下发,重新发送 2024-06-18 16:29:47 +08:00
xiang2lin 82a4353949 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-18 10:17:22 +08:00
xiang2lin 54eb505bda 增加oa数据源编码配置 2024-06-18 09:43:43 +08:00
xiang2lin 444e034511 增加电子回单、交易明细查询配置 2024-06-18 09:17:01 +08:00
xiang2lin 74e0f8ae38 增加cbs8电子回单下载临时存放文件夹配置 2024-06-17 15:11:32 +08:00
hecan 92ff85498d 用户档案插件配置 2024-06-17 14:59:51 +08:00
yuqh 72b827fa11 越城公用配置文件 2024-06-17 14:24:03 +08:00
yuqh 4d26dfa435 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
 Conflicts:
	buildpackage/src/main/resources/application-yc.yml
2024-06-17 14:23:25 +08:00
xiang2lin 4b2a51cb04 越城区配置 2024-06-17 14:21:57 +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
hecan 315dc6582a 增加组织和项目插件配置 2024-06-17 14:16:14 +08:00
xiang2lin 5723dc440d cbs8插件spring配置文件 2024-06-17 13:40:11 +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
xiang2lin 5017517684 cbs密钥 2024-06-14 11:22:13 +08:00
yuqh 6032e90e25 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java
2024-06-11 10:49:28 +08:00
yuqh 564b7b6138 BIP单据与获取token公用方法编写 2024-06-11 10:10:37 +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
xiang2lin c7c6ab1c4e 越城区配置 2024-06-07 16:12:01 +08:00
xiang2lin fa1e399968 越城区配置 2024-06-07 16:11:17 +08:00
xiang2lin ab2d1b9fc4 越城区配置 2024-06-07 16:08:03 +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
lvleigang 03e4172120 修改适配达梦数据源 2024-05-31 16:48:13 +08:00
lvleigang 303e4f1340 修改适配达梦数据源 2024-05-31 16:45:13 +08:00
lvleigang 22e1047fd9 修改主数据生成类 2024-05-31 15:26:15 +08:00
lvleigang 478211ad96 修改主数据生成类 2024-05-31 09:12:40 +08:00