From 8c63afebda835bfb3b15a3d6877d9c38789f5b96 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Sat, 3 Jan 2026 17:18:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=AE=80=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/common/biz/domain/BmCompanyInfo.java | 3 +++ .../main/resources/mapper/material/device/DevInfoMapper.xml | 1 + .../src/main/resources/mapper/material/index/IndexMapper.xml | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java index dc795dd..3697b6d 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java @@ -37,6 +37,9 @@ public class BmCompanyInfo implements Serializable { @ApiModelProperty(value = "企业名称", required = true) private String companyName; + @ApiModelProperty(value = "企业简称", required = true) + private String companyAbbreviationName; + /** * 企业类型(社会企业,南网集团企业,南网控股企业) */ diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index de6cbd8..bcbed21 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -713,6 +713,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT sd.dept_id as companyId, sd.dept_name as companyName, + sd.dept_abbreviation as companyAbbreviationName, sd.is_show as isShow, b.operate_address as operateAddress FROM diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml index 1e453ee..17d6485 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml @@ -108,7 +108,9 @@ ORDER BY t.applyTime DESC;