Merge branch 'gray' into test6.8.9

Conflicts:
	dal/src/main/java/com/yoho/order/model/BuyerOrderReq.java

+package com.yohobuy.ufo;
+
+import com.yoho.ufo.util.XlsxUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Created by li.ma on 2019/3/28.
+ */
+public class ExcelParseUtil {
+    public static void main(String[] args) {
+        try {
+            List<LiveVideoModel> dataList = XlsxUtils.parse(new File("C:\\Users\\li.ma\\Desktop\\鉴定视频有问题的.xlsx"), LiveVideoModel.class);
+
+            for (LiveVideoModel item : dataList) {
+                String l = String.format("curl 'http://172.31.70.39:8088/ufoPlatform/live/generateMp4Vedio?debug=XYZ&orderCode=%d&startTime=%d&endTime=%d&cameraCode=%d'", item.getOrderCode(), item.getStartTime(), item.getEndTime() + 1, item.getCameraCode());
+                System.out.println(l);
+            }
+
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

+package com.yohobuy.ufo;
+
+import com.yoho.ufo.annotation.BatchImportField;
+import lombok.Data;
+
+/**
+ * Created by li.ma on 2019/3/28.
+ */
+@Data
+public class LiveVideoModel {
+    @BatchImportField(index = 0)
+    private Long orderCode;
+    @BatchImportField(index = 1)
+    private Integer startTime;
+    @BatchImportField(index = 2)
+    private Integer endTime;
+    @BatchImportField(index = 3)
+    private Integer cameraCode;
+}