Merge branch 'release' into test

2 years ago · c3c6fc679f
parent a50f7b1250 a478ca4e08
commit c3c6fc679f
2 changed files with 1 additions and 0 deletions
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
@ -688,6 +688,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
                    String spbm = item.getSpbm();
                    String spmc = item.getXmmc();
                    String sl = item.getSl();
+                    item.setZnfm(ConfigureConstant.STRING_0);
                    if (StringUtils.isNotBlank(spbm) && !ConfigureConstant.XJZSXHQD.equals(spmc)) {
                        SpjcXx spjcXx = SpjcXx.initSpjcXx(spbm, spmc, sl, qdbz);
                        try {
--- a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx
+++ b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx