fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopLogisticsQueryAction.java

@@ -68,6 +68,8 @@
        }
        logisticsInfo.put("isShipments",AppConstance.IS_SHIPMENTS);
        logisticsInfo.put("logisticsStatus",shopDeliveryInfo.getLogisticsStatus()==null?"0":String.valueOf(shopDeliveryInfo.getLogisticsStatus()));
        logisticsInfo.put("logisticsCompany", shopDeliveryInfo.getLogisticsCompany());
        logisticsInfo.put("waybillNo", shopDeliveryInfo.getWaybillNo());
        logisticsInfo.put("describe",describe);
        result.setStatus(AjaxResult.STATUS_SUCCESS);
        result.putInMap("logisticsInfo",logisticsInfo);