合并分支 'dxy' 到 'qa'

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

@@ -48,14 +48,14 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
     private static final int PHOTO_TYPE_NOON_CLOCK_IN = 6;
     /** 下班打卡图片 */
     private static final int PHOTO_TYPE_CLOCK_OUT = 7;
-    /** 当日销量POS机页面凭证 */
-    private static final int PHOTO_TYPE_POS_SELL_VOUCHER = 8;
     /** 试吃照片 */
-    private static final int PHOTO_TYPE_TASTY_PHOTO = 9;
-    /** 配发赠品照片 */
-    private static final int PHOTO_TYPE_SEND_GIFT_PHOTO = 10;
+    private static final int PHOTO_TYPE_TASTY_PHOTO = 8;
+    /** 当日销量POS机页面凭证 */
+    private static final int PHOTO_TYPE_POS_SELL_VOUCHER = 9;
     /** 高峰期在岗 */
-    private static final int PHOTO_TYPE_RANDOM_TASK = 11;
+    private static final int PHOTO_TYPE_RANDOM_TASK = 10;
+    /** 配发赠品照片 */
+    private static final int PHOTO_TYPE_SEND_GIFT_PHOTO = 11;
     /** 试吃物料照片 */
     private static final int PHOTO_TYPE_TASTY_MATERIALS = 12;
 
@@ -369,8 +369,6 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         if (!(photosType8Size < 2 || Objects.isNull(photosType8.get(1)))) {
             valuesImageToSheetByRobot2(String.format(rangFormat, "AM", "AM"), photosType8.get(1).getPhotoUrl());
             pct.append("、销额POS证明（补充）："+DateUtil.formatDateTime(photosType8.get(1).getCreateTime()));
-        }else if (StringUtils.isNotBlank(rdo.getPosManualSalesRecord() )) {
-            row.add(rdo.getPosManualSalesRecord());
         }