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 |
|
yefei
|
ff42718404
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
1cc50f20b7
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
30440cde8f
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
0bb75b8e4d
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
d4f9900e34
|
ariesy client参数抽取配置
|
2 years ago |
|
wangrangrang
|
b5284da765
|
去掉推送默认值,修改定时参数为300
|
2 years ago |
|
yefei
|
59d0d3b6fc
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
e1a4a7b194
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
b295aaaf53
|
ariesy 修改认证人权限
|
2 years ago |
|
wangrangrang
|
bc2c6d8c03
|
去掉推送默认值
|
2 years ago |
|
yefei
|
3cc6e5606f
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
b9a9957463
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
9cbdfdd242
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
3405d296de
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
eb806b703a
|
ariesy 修改认证人权限
|
2 years ago |
|
yefei
|
87533f6469
|
ariesy 增加注解&插入日志时捕获异常
|
2 years ago |
|
yefei
|
4b9521ed1a
|
ariesy 增加注解&插入日志时捕获异常
|
2 years ago |
|
yefei
|
c7125c4e97
|
ariesy 增加注解&插入日志时捕获异常
|
2 years ago |
|
yefei
|
3c2940dc63
|
Merge branches '1008-采集入库数据重复' and 'release' of http://192.168.12.182/invoice/pt into 1008-采集入库数据重复
|
2 years ago |
|
yefei
|
355a3c4d22
|
ariesy 加分布式锁
|
2 years ago |
|
yefei
|
e26a1ad589
|
ariesy 认证人增加deptId
|
2 years ago |
|
yefei
|
acee656c64
|
Merge branches '1007-认证人和组织权限需要匹配,只显示启用了该组织进项功能的人' and 'release' of http://192.168.12.182/invoice/pt into 1007-认证人和组织权限需要匹配,只显示启用了该组织进项功能的人
|
2 years ago |
|
yefei
|
7941a0881f
|
ariesy 认证人增加deptId
|
2 years ago |
|
yefei
|
1d8c3759a9
|
ariesy 验证查验定时任务
|
2 years ago |
|
yefei
|
d9850d7f7b
|
ariesy 去掉报错代码&测试采集勾选发票完成
|
2 years ago |
|
yefei
|
7637162d98
|
ariesy 增加事务注解代码
|
2 years ago |
|
yefei
|
7b186c3495
|
ariesy 增加事务注解代码
|
2 years ago |
|
yefei
|
41656f807f
|
ariesy 合并代码
|
2 years ago |
|
yefei
|
1f108f2608
|
Merge branches '0925-临时合并分支' and 'release' of http://192.168.12.182/invoice/pt into 0925-临时合并分支
Conflicts:
dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
|
2 years ago |
|
yefei
|
a13f530a5d
|
ariesy 修复手工认证界面发票不能选择的问题
|
2 years ago |
|
yefei
|
4087aeffdf
|
ariesy 修复手工认证界面发票不能选择的问题
|
2 years ago |
|
wangrangrang
|
050e1bb0c1
|
Merge remote-tracking branch 'origin/1010-不显示购方名称重新查验' into release
|
2 years ago |
|
yefei
|
613324f3dd
|
ariesy 增加切换数据源代码
|
2 years ago |
|
wangrangrang
|
45bdcac9f8
|
Merge remote-tracking branch 'origin/1007-手工认证&认证查询增加认证中状态' into release
|
2 years ago |
|
wangrangrang
|
46ef00be61
|
Merge remote-tracking branch 'origin/1008-sys_user_org中间表taxno为空' into release
|
2 years ago |
|
yefei
|
2818adf7c2
|
ariesy 已认证的数据认证证人为空时，设置成damin
|
2 years ago |
|
yefei
|
57b1c2b5c8
|
ariesy 已认证的数据认证证人为空时，设置成damin
|
2 years ago |
|
yefei
|
56b2a9ff5e
|
ariesy 已认证的数据认证证人为空时，设置成damin
|
2 years ago |
|
yefei
|
6d646e3d63
|
ariesy 已认证的数据认证证人为空时，设置成damin
|
2 years ago |
