feat:食堂搜索条件

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

@@ -19,4 +19,6 @@ public class HardCarDto extends HardCarEntity {
 
     private String hourType;
 
+    private Long merchantId;
+
 }

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml

@@ -138,6 +138,9 @@
             <if test="dto.hourType != null and dto.hourType != '' ">
                 and o.hour_type = #{dto.hourType}
             </if>
+            <if test="dto.merchantId != null">
+                and o.merchant_id = #{dto.merchantId}
+            </if>
         </where>
         group by a.product_id
         order by SUM(a.product_count) desc