wangrangrang
|
81d4cb8d05
|
Merge remote-tracking branch 'origin/1007-认证人和组织权限需要匹配,只显示启用了该组织进项功能的人' into release
|
2 years ago |
|
wangrangrang
|
3e280a671b
|
Merge remote-tracking branch 'origin/1007-认证人为空时设置成admin' into release
|
2 years ago |
路明慧
|
b0208b0ba5
|
Merge branch 'release' of http://192.168.12.182/invoice/pt into 1007-认证人和组织权限需要匹配,只显示启用了该组织进项功能的人
|
2 years ago |
|
路明慧
|
0d4663022c
|
Merge branch 'release' of http://192.168.12.182/invoice/pt into 1007-认证人为空时设置成admin
|
2 years ago |
|
wangrangrang
|
12a9325634
|
合并代码
|
2 years ago |
|
wangrangrang
|
c57dd6e57f
|
Merge remote-tracking branch 'origin/1019-分布式Reddision' into release
# Conflicts:
# dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java
|
2 years ago |
王琦
|
c4800d7f4b
|
Merge branch 'task销项发票提交' into release
# Conflicts:
# dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
|
2 years ago |
|
路明慧
|
7a7abb7301
|
修改认证人展示和查询
|
2 years ago |
|
路明慧
|
845ed9b416
|
修改认证人展示和查询
|
2 years ago |
|
路明慧
|
dcc5ab610f
|
修改认证人展示和查询
|
2 years ago |
|
路明慧
|
dbcf7f6aff
|
修改认证人展示和查询
|
2 years ago |
|
路明慧
|
9566e2c4fd
|
根据组织代码获取认证人
|
2 years ago |
|
王琦
|
0492d07dab
|
销项发票提交 调试
|
2 years ago |
|
路明慧
|
bed94e9fe8
|
deptId和did互换
|
2 years ago |
|
路明慧
|
08e6cbcce2
|
修改认证人不全问题
|
2 years ago |
|
王琦
|
9004686f27
|
销项发票提交 调试
|
2 years ago |
|
王琦
|
fb9aa083dd
|
销项发票提交 调试
|
2 years ago |
|
王琦
|
42b3a1da16
|
销项发票提交 调试
|
2 years ago |
|
王琦
|
29fd83da9c
|
销项发票提交 调试
|
2 years ago |
|
王琦
|
71bce900d3
|
销项发票提交 调试
|
2 years ago |
|
王琦
|
cf55fa1e05
|
销项发票提交
|
2 years ago |
yefei
|
b3a673e983
|
ariesy 去除重复税号
|
2 years ago |
|
yefei
|
aa1972b1a8
|
Merge branches '1007-认证人和组织权限需要匹配,只显示启用了该组织进项功能的人' and 'release' of http://192.168.12.182/invoice/pt into 1007-认证人和组织权限需要匹配,只显示启用了该组织进项功能的人
|
2 years ago |
|
yefei
|
5a3d03497d
|
Merge branches '1007-认证人为空时设置成admin' and 'release' of http://192.168.12.182/invoice/pt into 1007-认证人为空时设置成admin
|
2 years ago |
|
王琦
|
00fd3ddadc
|
修改test配置文件
|
2 years ago |
|
yefei
|
b7a6609b90
|
ariesy 去除切换数据源代码
|
2 years ago |
|
yefei
|
8dd5902810
|
ariesy 修改认证人权限
|
2 years ago |
|
wangrangrang
|
08b9ddef0a
|
去除抛出的异常
|
2 years ago |
|
yefei
|
1812801da7
|
ariesy 增加redisson集群配置
|
2 years ago |
|
wangrangrang
|
23de1419fc
|
捕获异常
|
2 years ago |
|
yefei
|
de5dfceab8
|
ariesy 更改throw exception
|
2 years ago |
|
yefei
|
c32833cf05
|
ariesy Redission增加集群配置
|
2 years ago |
|
yefei
|
67a7a88f46
|
ariesy 增加认证人admin
|
2 years ago |
|
yefei
|
b49b83e72f
|
ariesy 增加认证人admin
|
2 years ago |
|
yefei
|
60e02298bc
|
ariesy 认证人是admin的时候,查询已认证的空的数据
|
2 years ago |
|
yefei
|
57b337ea06
|
ariesy 增加throw
|
2 years ago |
|
yefei
|
ff0cd6b2bb
|
ariesy 增加throw
|
2 years ago |
|
yefei
|
338b0f4b9e
|
ariesy 增加throw
|
2 years ago |
|
yefei
|
f0355d04ac
|
ariesy 增加admin
|
2 years ago |
|
yefei
|
79b3bbe118
|
Merge branches '1007-认证人和组织权限需要匹配,只显示启用了该组织进项功能的人' and 'release' of http://192.168.12.182/invoice/pt into 1007-认证人和组织权限需要匹配,只显示启用了该组织进项功能的人
|
2 years ago |
|
yefei
|
0422bcf621
|
Merge branches '1007-认证人为空时设置成admin' and 'release' of http://192.168.12.182/invoice/pt into 1007-认证人为空时设置成admin
|
2 years ago |
|
yefei
|
80a101850c
|
Merge branches '0925-临时合并分支' and 'release' of http://192.168.12.182/invoice/pt into 0925-临时合并分支
Conflicts:
dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java
dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java
|
2 years ago |
|
wangrangrang
|
374a93297e
|
Merge remote-tracking branch 'origin/1017-remove_system_default' into release
|
2 years ago |
|
yefei
|
4dbf9d62e2
|
ariesy 修改定时任务报错
|
2 years ago |
|
wangrangrang
|
d453b29e3b
|
Merge remote-tracking branch 'origin/1017-remove_system_default' into release
|
2 years ago |
|
yefei
|
a11d0d1e9c
|
ariesy 修改定时任务报错
|
2 years ago |
|
wangrangrang
|
f038561c3c
|
Merge remote-tracking branch 'origin/1008-采集入库数据重复' into release
|
2 years ago |
|
yefei
|
28d64f6b79
|
ariesy 去掉redission相关代码
|
2 years ago |
|
yefei
|
0dbec55da0
|
ariesy 修改认证人权限
|
2 years ago |
|
wangrangrang
|
7b5616200c
|
Merge remote-tracking branch 'origin/1008-采集入库数据重复' into release
|
2 years ago |
