wangrangrang
|
3726fa44c4
|
Merge remote-tracking branch 'origin/bhDeleteCatch' into release
|
2 years ago |
路明慧
|
e0bd500bd7
|
暂时注释
|
2 years ago |
|
wangrangrang
|
82b1c02a9d
|
Merge remote-tracking branch 'origin/pushTicketNew' into release
|
2 years ago |
|
wangrangrang
|
79e36ce2ba
|
Merge remote-tracking branch 'origin/dev-scyl' into release
|
2 years ago |
|
wangrangrang
|
9c612420f5
|
Merge remote-tracking branch 'origin/config' into release
|
2 years ago |
|
wangrangrang
|
3f4c5708d0
|
Merge remote-tracking branch 'origin/bhDeleteCatch' into release
|
2 years ago |
|
路明慧
|
4c0fa9bbc9
|
补偿推送时没有发票号码不能推送票池
|
2 years ago |
|
路明慧
|
aa33dfb8e7
|
补偿推送时没有发票号码不能推送票池
|
2 years ago |
|
路明慧
|
b898ebba76
|
还原一开始修改机动车标志，并修改为在方格调订单处修改
|
2 years ago |
|
路明慧
|
1cde4e918c
|
添加实体映射
|
2 years ago |
|
路明慧
|
360a205889
|
推送税盘信息添加机动车判断
|
2 years ago |
|
路明慧
|
9ac356e637
|
添加机动车发票标识
|
2 years ago |
|
路明慧
|
ae0b5855ee
|
添加获取分机号时url判断
|
2 years ago |
|
路明慧
|
cc6a1a8a15
|
修改方格注册时的调用url
|
2 years ago |
|
路明慧
|
a19af8c479
|
邮件交付模板和下载文件修改
|
2 years ago |
|
路明慧
|
958fdfed15
|
驳回成功添加删除发票流水号缓存删除逻辑
|
2 years ago |
|
wangrangrang
|
dd4098ad90
|
修改nacos命名空间
|
2 years ago |
|
wangrangrang
|
89fd78581a
|
修改nacos命名空间
|
2 years ago |
|
wangrangrang
|
cda26e9fd8
|
修改nacos账号密码
|
2 years ago |
|
wangrangrang
|
397e5590e8
|
修改redis为哨兵
|
2 years ago |
|
wangrangrang
|
100b54ade6
|
修改nacos密码
|
2 years ago |
|
wangrangrang
|
d0f52099ca
|
Merge remote-tracking branch 'origin/dev-jdc' into release
|
2 years ago |
|
wangrangrang
|
0acb0937e5
|
Merge remote-tracking branch 'origin/dev-bwukeyce' into release
# Conflicts:
# order-management-consumer/pom.xml
|
2 years ago |
|
wangrangrang
|
e8b272b4de
|
Merge remote-tracking branch 'origin/FI871' into release
# Conflicts:
# order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java
|
2 years ago |
|
wangrangrang
|
fa3612dbbe
|
Merge remote-tracking branch 'origin/hzxxbReceive' into release
|
2 years ago |
|
wangrangrang
|
9421eb1eed
|
Merge remote-tracking branch 'origin/dev-hzxz' into release
|
2 years ago |
|
wangrangrang
|
f17414067f
|
Merge remote-tracking branch 'origin/xingze' into release
# Conflicts:
# order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
# order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java
# order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInvoiceInfoMapper.java
# order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/OrderInvoiceInfoService.java
# order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml
|
2 years ago |
|
wangrangrang
|
c0c93419bb
|
Merge remote-tracking branch 'origin/dev-chlc' into release
|
2 years ago |
|
wangrangrang
|
12471f5bb5
|
增加商品行序号
|
2 years ago |
|
路明慧
|
47e31f132c
|
将字符串替换为枚举
|
2 years ago |
|
wangrangrang
|
7cc53267fb
|
校验凭证过账日期不为空才解析
|
2 years ago |
|
路明慧
|
6f0aab4db4
|
修改红字信息表重复更新状态导致状态错误
|
2 years ago |
|
wangrangrang
|
a811e5586f
|
公司代码为空时 才进行下一步查询
|
2 years ago |
高荣琳
|
70305cc1ed
|
feature：红字下载
|
2 years ago |
|
高荣琳
|
ca8a12abd2
|
feature：去除aisinoutils
|
2 years ago |
|
高荣琳
|
c5a3a3e125
|
feature:删除依赖京东依赖
|
2 years ago |
|
wangrangrang
|
572d3fcc09
|
Merge remote-tracking branch 'origin/dev-blfp' into release
|
2 years ago |
|
高荣琳
|
1f7104a242
|
feature:冲红流程比较剩余金额判断
|
2 years ago |
|
高荣琳
|
fdf707c39a
|
feature:补录报账单号，公司代码填充
|
2 years ago |
|
高荣琳
|
3f94635161
|
feature:百望 和 ukey 盘拆分按照1分钱计算
|
2 years ago |
|
高荣琳
|
e0b7a6ea2d
|
feature:百望盘或UKEY重新1分钱计算后
|
2 years ago |
|
高荣琳
|
f43be2f9ef
|
feature:补录报账单号，修改order_info、order_invoice_info的订单号
|
2 years ago |
|
高荣琳
|
e309172c37
|
feature:补录报账单号，系统来源默认SAP
|
2 years ago |
zhenghaiyang@ele-cloud.com
|
e81587f1dd
|
feature 1.修复空指针问题
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
fe2438588c
|
feature 1.修复单价赋值未负数的问题
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
a3cf2af3c6
|
feature 1.修复分机号未赋值的情况
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
35cc5c42f1
|
feature 1.修改依赖redisson版本号
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
7a75cb538a
|
feature 1.还源代码
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
f17032b1b4
|
feature 1.更换redis锁
|
2 years ago |
|
zhenghaiyang@ele-cloud.com
|
ac87ae0232
|
feature 1.更换redis锁
|
2 years ago |
