Merge branch 'gyj' into test

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/ExportTableStsDataDto.java

@@ -0,0 +1,18 @@
+package cn.ysk.cashier.dto.shop;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yijiegong
+ */
+@Data
+public class ExportTableStsDataDto {
+    private String dateStr;
+
+    private List<Map<String, Object>> data;
+
+    private List<List<Integer>> mergeCells;
+}