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