From d5db8550a6f76f5f047fcaa1248694a710ef1733 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 5 Sep 2025 21:53:05 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=B3=BB=E7=BB=9F=E6=A0=87=E8=AF=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java | 2 ++ .../main/java/com/ruoyi/xkt/dto/store/StoreSimpleResDTO.java | 2 ++ xkt/src/main/resources/mapper/StoreMapper.xml | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java index c70679ace..2948765bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java @@ -41,6 +41,8 @@ public class StoreSimpleResVO { private Boolean focus; @ApiModelProperty(value = "档口logo") private SSFileVO logo; + @ApiModelProperty(value = "档口库存系统 1 步橘网 2 天友 3 发货宝") + private Integer stockSys; @Data public static class SSFileVO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreSimpleResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreSimpleResDTO.java index 1b82a08f7..40502995e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreSimpleResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreSimpleResDTO.java @@ -43,6 +43,8 @@ public class StoreSimpleResDTO { private Long storeLogoId; @ApiModelProperty(value = "档口logo") private SSFileDTO logo; + @ApiModelProperty(value = "档口库存系统 1 步橘网 2 天友 3 发货宝") + private Integer stockSys; @Data public static class SSFileDTO { diff --git a/xkt/src/main/resources/mapper/StoreMapper.xml b/xkt/src/main/resources/mapper/StoreMapper.xml index 60a410e27..90d68efc0 100644 --- a/xkt/src/main/resources/mapper/StoreMapper.xml +++ b/xkt/src/main/resources/mapper/StoreMapper.xml @@ -33,7 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s.store_address, sc.legal_name, sc.license_name, - s.store_logo_id + s.store_logo_id, + s.stock_sys FROM store s JOIN store_certificate sc ON s.id = sc.store_id WHERE