From 82783ea34163fad1b585a17cd0b3e17e95ed4905 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 19 Jan 2024 16:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=93=81=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java   | 4 ++++
 .../yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java
index f818e6f..b55939e 100644
--- a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java
+++ b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/entity/brand/BrandVo.java
@@ -15,4 +15,8 @@ public class BrandVo {
     private String brandName;
     @ApiModelProperty("品牌id")
     private String id;
+    @ApiModelProperty("起始数量")
+    private String qssl;
+    @ApiModelProperty("订购协议")
+    private String dgxy;
 }
diff --git a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml
index 1abbb53..b302dd7 100644
--- a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml
+++ b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsBrandMapper.xml
@@ -24,6 +24,6 @@
     </sql>
 
     <select id="getList" resultType="com.yxt.yythmall.mallplus.mbg.pms.entity.brand.BrandVo">
-        select name brandName,id from pms_brand
+        select name brandName,id,qssl,dgxy from pms_brand order by sort asc
     </select>
 </mapper>