合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/export/mapper/entity/TemporaryActivityReportedDO.java

@@ -75,4 +75,6 @@ public class TemporaryActivityReportedDO implements Serializable {
     private BigDecimal blackDuckSales;
     // 礼盒销售（元）
     private BigDecimal giftBoxSales;
+    // 手工POS机销额
+    private String posManualSalesRecord;
 }

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

@@ -323,14 +323,19 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         List<TemporaryActivityPhotoDO> photosType8 = Objects.isNull(photoTypeMap.get(8)) ? new ArrayList<>() : photoTypeMap.get(8);
         int photosType8Size = photosType8.size();
 
+
         // 真实pos证明反馈1 >>>
-        if (!(photosType8Size < 1 || Objects.isNull(photosType8.get(0)))) {
+        if (!(photosType8Size < 1 || Objects.isNull(photosType8.get(0))) ) {
             valuesImageToSheet(String.format(rangFormat, "AL", "AL"), photosType8.get(0).getPhotoUrl());
+        }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());
+        }else if (StringUtils.isNotBlank(rdo.getPosManualSalesRecord() )) {
+            row.add(rdo.getPosManualSalesRecord());
         }