Merge branch 'wangdingyi' into 'dev'

查询标准下检验项添加label值

See merge request !329

quality-review/src/main/java/com/ruoyi/domain/vo/DictDataVO.java

@@ -8,4 +8,6 @@ public class DictDataVO {
     private Long dictCode;
 
     private String dictValue;
+
+    private String dictLabel;
 }

quality-review/src/main/resources/mapper/StandardInspectionItemRelationMapper.xml

@@ -10,7 +10,7 @@
         <result property="dictCode" column="dict_code" jdbcType="BIGINT"/>
     </resultMap>
     <select id="getListByStandardId" resultType="com.ruoyi.domain.vo.DictDataVO">
-        SELECT sir.dict_code, dict_value as dictValue FROM t_standard_inspection_item_relation sir
+        SELECT sir.dict_code, dict_value as dictValue, dict_label as dictLabel FROM t_standard_inspection_item_relation sir
         LEFT JOIN sys_dict_data sdt on sdt.dict_code = sir.dict_code
         WHERE standard_id = #{standardId}
     </select>