商户下拉，每日菜谱接口修改

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/DailyMenuAll.java

@@ -1,5 +1,6 @@
 package com.bsd.pjcloud.canteen.dto;
 
+import com.bsd.pjcloud.canteen.vo.DailyMenuVO;
 import lombok.Data;
 
 import java.util.List;

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/DailyMenuVO.java

@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.canteen.dto;
+package com.bsd.pjcloud.canteen.vo;
 
 import lombok.Data;
 

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/MerchantInfoVO.java

@@ -0,0 +1,21 @@
+package com.bsd.pjcloud.canteen.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class MerchantInfoVO {
+
+    /**
+     * 编号
+     */
+    @Schema(description="编号")
+    private Long id;
+    /**
+     * 商户名
+     */
+    @Schema(description="商户名")
+    private String name;
+}