Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'qa' of…

Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -144,6 +144,7 @@ public class OrderSdkAdapter {
         var1.setReason(reason);
         var1.setOrderClient(Integer.parseInt(orderBean.getOrderClient()));
         var1.setPartnerId(orderBean.getCompanyId());
+        var1.setStoreId(orderBean.getShopId());
         if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
             var1.setExpectTime(cn.freemud.base.util.DateUtil.convert2String(new Date(orderBean.getGmtExpect()), cn.freemud.base.util.DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         }