Merge branch 'v21.1_jianzhuang_20240807' into dev

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

 package com.clx.performance.vo.app;
 
+import cn.hutool.json.JSONUtil;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.OrderGoodsEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
@@ -9,10 +10,12 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -268,4 +271,21 @@ public class OrderChildVO {
     private String superviseContacts;
     @ApiModelProperty(value = "监装联系人电话")
     private String superviseMobile;
+
+
+    @ApiModelProperty(value = "发货地采样照片")
+    public List<String> getSendSamplingPicList() {
+        if (StringUtils.isNotBlank(sendSamplingPic)) {
+            return JSONUtil.toList(sendSamplingPic, String.class);
+        }
+        return new ArrayList<>();
+    }
+
+    @ApiModelProperty(value = "发货地采样视频")
+    public List<String> getSendSamplingVideoList() {
+        if (StringUtils.isNotBlank(sendSamplingVideo)) {
+            return JSONUtil.toList(sendSamplingVideo, String.class);
+        }
+        return new ArrayList<>();
+    }
 }