Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of…

Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

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

@@ -2599,7 +2599,7 @@ public class OrderSdkAdapter {
         }
         if (StringUtils.isNotBlank(product.getClassificationId())){
             extInfo.setThirdCensusCategoryId(product.getClassificationId());
-            extInfo.setThirdCensusCategoryId(product.getClassificationName());
+            extInfo.setThirdCensusCategoryName(product.getClassificationName());
         }
         if (0 != product.getTax()){
             extInfo.setTax(product.getTax());