合并分支 'qa' 到 'master'

src/main/java/com/wangxiaolu/export/service/impl/ActivityToFeishuSheetServiceImpl.java

@@ -311,10 +311,10 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
          * 推广试吃照片
          */
 
-        // 试吃执行照片 推广试吃照片3 >>>
+        // 试吃执行照片 推广试吃照片 >>>
         if (!(photosType1Size < 1 || Objects.isNull(photosType1.get(0)))) {
             valuesImageToSheet(String.format(rangFormat, "AH", "AH"), photosType1.get(0).getPhotoUrl());
-            pct.append("、试吃3："+DateUtil.formatDateTime(photosType1.get(0).getCreateTime()));
+            pct.append("、推广试吃照片："+DateUtil.formatDateTime(photosType1.get(0).getCreateTime()));
         }
 
 
@@ -326,7 +326,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         // 推广互动照片 >>>
         if (!(photosType2Size < 1 || Objects.isNull(photosType2.get(0)))) {
             valuesImageToSheet(String.format(rangFormat, "AI", "AI"), photosType2.get(0).getPhotoUrl());
-            pct.append("、互动1："+DateUtil.formatDateTime(photosType2.get(0).getCreateTime()));
+            pct.append("、推广互动照片："+DateUtil.formatDateTime(photosType2.get(0).getCreateTime()));
         }
 
 
@@ -338,7 +338,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         // 推广成交照片1 >>>
         if (!(photosType3Size < 1 || Objects.isNull(photosType3.get(0)))) {
             valuesImageToSheet(String.format(rangFormat, "AJ", "AJ"), photosType3.get(0).getPhotoUrl());
-            pct.append("、成交："+DateUtil.formatDateTime(photosType3.get(0).getCreateTime()));
+            pct.append("、推广成交："+DateUtil.formatDateTime(photosType3.get(0).getCreateTime()));
         }
 
 
@@ -361,10 +361,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         if (!(photosType8Size < 1 || Objects.isNull(photosType8.get(0))) ) {
             valuesImageToSheet(String.format(rangFormat, "AL", "AL"), photosType8.get(0).getPhotoUrl());
             pct.append("、销额POS证明："+DateUtil.formatDateTime(photosType8.get(0).getCreateTime()));
-        }else if (StringUtils.isNotBlank(rdo.getPosManualSalesRecord() )) {
-            row.add(rdo.getPosManualSalesRecord());
         }
-
         // 真实pos证明反馈2 >>>
         if (!(photosType8Size < 2 || Objects.isNull(photosType8.get(1)))) {
             valuesImageToSheetByRobot2(String.format(rangFormat, "AM", "AM"), photosType8.get(1).getPhotoUrl());