Merge branch 'dev-comp-price' into test

src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java

@@ -1978,10 +1978,10 @@ public class ClientUtils {
      */
     public static Map<String, Object> queryLogistics(IDataModel model, int idx, String expenseItemNo) {
         DynamicObject dataEntity = model.getDataEntity(true);
-        DynamicObject transportstyle = dataEntity.getDynamicObject("yem_transportstyle");
         DynamicObjectCollection materialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
         DynamicObject d = materialinfo.get(idx);
         DynamicObjectCollection ports = d.getDynamicObjectCollection("yem_port");
+        DynamicObject transportstyle = d.getDynamicObject("yem_shippingmethod");
         if (ports.isEmpty()) {
             return null;
         }