 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 |
|
lvleigang
|
4e94526a30
|
主数据修改
|
2024-06-20 08:43:33 +08:00 |
 xiang2lin
|
d2a97cd7ad
|
测试类
|
2024-06-19 17:02:09 +08:00 |
|
xiang2lin
|
0ca5c75a1a
|
cbs8 插件
|
2024-06-19 17:01:54 +08:00 |
|
xiang2lin
|
642986b94a
|
cbs8 插件
|
2024-06-19 16:56:21 +08:00 |
|
xiang2lin
|
e4d0f19e02
|
cbs8插件
|
2024-06-19 13:47:44 +08:00 |
|
lvleigang
|
772a2e86f5
|
修改返回默认值
|
2024-06-19 11:56:42 +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
|
e64978e5e9
|
cbs8插件
|
2024-06-19 10:06:53 +08:00 |
|
lvleigang
|
2d4b3af64c
|
主数据下发，重新发送
|
2024-06-18 17:17:11 +08:00 |
|
lvleigang
|
db50cf0c1a
|
主数据下发，重新发送
|
2024-06-18 16:29:47 +08:00 |
|
xiang2lin
|
fccd328111
|
测试cbs接口
|
2024-06-18 10:35:55 +08:00 |
|
xiang2lin
|
f0b53a019f
|
cbs8
|
2024-06-18 10:35:30 +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
|
29c560bcfe
|
cbs8
|
2024-06-18 09:16:47 +08:00 |
|
xiang2lin
|
347eb4e89f
|
交易明细查询接口
|
2024-06-18 09:15:50 +08:00 |
|
xiang2lin
|
df4f4f584b
|
电子回单
|
2024-06-18 09:15:01 +08:00 |
|
xiang2lin
|
74e0f8ae38
|
增加cbs8电子回单下载临时存放文件夹配置
|
2024-06-17 15:11:32 +08:00 |
 hecan
|
cbf2fff967
|
用户档案插件
|
2024-06-17 15:00:04 +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
|
c89370ac0c
|
cbs8接口
|
2024-06-17 13:40:41 +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 |
|
hecan
|
cfbda9907c
|
调整包路径
|
2024-06-13 10:08:56 +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
|
08994cefb1
|
Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
|
2024-06-11 10:05:33 +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
|
64f8a58ff8
|
项目档案和组织档案插件
|
2024-06-11 09:56:18 +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 |
|
hecan
|
d6f4e5febb
|
调整数据库连接地址
|
2024-05-29 17:20:12 +08:00 |
|
yuqh
|
77ea42d08e
|
BIP单据与获取token公用方法编写
|
2024-05-29 10:17:40 +08:00 |
|
yuqh
|
314316824c
|
BIP单据与获取token公用方法编写
|
2024-05-29 10:17:28 +08:00 |