learshaw 4 місяців тому
батько
коміт
2e57155ae7

+ 11 - 0
ems/ems-core/src/main/java/com/ruoyi/ems/domain/EmsObjAttrDto.java

@@ -38,6 +38,9 @@ public class EmsObjAttrDto {
     /** 属性值名称 */
     private String attrValueName;
 
+    /** 属性值单位 */
+    private String attrUnit;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
@@ -81,6 +84,14 @@ public class EmsObjAttrDto {
         this.attrValueName = attrValueName;
     }
 
+    public String getAttrUnit() {
+        return attrUnit;
+    }
+
+    public void setAttrUnit(String attrUnit) {
+        this.attrUnit = attrUnit;
+    }
+
     public Date getUpdateTime() {
         return updateTime;
     }

+ 2 - 1
ems/ems-core/src/main/resources/mapper/ems/EmsObjAttrMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="attrName"    column="attr_name"    />
         <result property="attrValue"    column="attr_value"    />
         <result property="attrValueName"    column="attr_value_name"    />
+        <result property="attrUnit"    column="attr_unit"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
@@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectObjAttrDto"  resultMap="ObjAttrDtoResult">
         select
-            a.attr_group, a.attr_key, a.attr_name, v.attr_value, e.attr_value_name, v.update_time from  adm_ems_obj_attr a
+            a.attr_group, a.attr_key, a.attr_name, v.attr_value, e.attr_value_name, a.attr_unit, v.update_time from  adm_ems_obj_attr a
         left join
             (
                select