feat:食堂统计

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java

@@ -1,6 +1,7 @@
 package com.bsd.pjcloud.hard.api.dto.order;
 
 import com.bsd.pjcloud.admin.api.vo.base.BaseIsIncludeTreeInterface;
+import com.bsd.pjcloud.common.core.constant.enums.DateRangeTypeEnum;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import lombok.Data;
 
@@ -11,6 +12,8 @@ import java.util.List;
 @Data
 public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeInterface {
 
+    private DateRangeTypeEnum dateRangeType = DateRangeTypeEnum.YESTERDAY;
+
     private List<Long> deptIds;
 
     private Boolean isInclude = false;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/hard/PanelCanteenVo.java

@@ -19,6 +19,11 @@ public class PanelCanteenVo {
      */
     private String productName;
 
+    /**
+     * 商家名称
+     */
+    private String mchName;
+
     /**
      * 用餐时间段(早中晚)
      */
@@ -64,6 +69,11 @@ public class PanelCanteenVo {
      */
     private String weekStr;
 
+    /**
+     * 排序
+     */
+    private int order;
+
     @Data
     @Builder
     @AllArgsConstructor