You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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
..
src/main/java/com/dxhy/order	Merge remote-tracking branch 'origin/xingze' into release	2 years ago
.gitignore	feature 1.山能订单服务代码初始化，版本：V6.1.2.5	2 years ago
pom.xml	feature 1.增加负数冲红流程	2 years ago