From eb77373d92f01e51b98bda8fae66315ed9a4394d Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 17:08:57 +0800
Subject: [PATCH] 骑手接单和骑手取消订单

---
 oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java b/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
index 7d443e4..a527753 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java
@@ -31,6 +31,10 @@
     private Long merchantId;
 
     @NotBlank
+    @ApiModelProperty(value = "商户类型")
+    private String merchantType;
+
+    @NotBlank
     @ApiModelProperty(value = "名称")
     private String merchantName;
 

--
Gitblit v1.9.3