新建量尺

src/main/java/com/dk/mdm/model/pojo/mst/MeasureRoom.java

@@ -1,6 +1,7 @@
 package com.dk.mdm.model.pojo.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 
@@ -95,7 +96,7 @@ public class MeasureRoom extends PageInfo<MeasureRoom> implements Serializable {
     @Excel(name = "量尺附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @ApiModelProperty(value = "量尺附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONObject measureAnnex;
+    private JSONArray measureAnnex;
 
 
     /**

src/main/java/com/dk/mdm/model/vo/mst/CusFollowVO.java

@@ -339,6 +339,10 @@ public class CusFollowVO implements Serializable {
 
     private String saleStatus;
 
+    @Excel(name = "量尺备注")
+    @ApiModelProperty(value = "量尺备注")
+    private String measureRemarks;
+
     private List<MeasureRoom> measureRoomList;
 
     @Excel(name = "销售渠道")

src/main/java/com/dk/mdm/service/mst/CusFollowService.java

@@ -373,6 +373,7 @@ public class CusFollowService extends BaseService<CusFollow> {
         measureReceipt.setFollowId(cusFollowVO.getFollowId());
         measureReceipt.setMeasureStatus(Constant.BasicDataConstant.MEASURE_STATUS_1.getValue());
         measureReceipt.setMeasureTime(LocalDateTime.now());
+        measureReceipt.setMeasureRemarks(cusFollowVO.getMeasureRemarks());
         //剩下参数有前台传
         measureReceiptService.insert(measureReceipt);