Merge remote-tracking branch 'origin/beta-prop-all' into beta-prop-all

# Conflicts:
#	jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java
#	jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/addInvoice/Bdczlxx.java
#	jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java
#	jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java
beta-prop-all
dongxiaoke 4 months ago
commit e875a77cf3

Diff Content Not Available