Merge branch 'develop_tzs_register' of…

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -116,12 +116,21 @@ WHERE
 	<select id="getDictByExtendsAndTypePage" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
 		SELECT *
 		FROM cb_data_dictionary
-		WHERE type = #{type}
+		WHERE
+		<choose>
+			<when test="type == 'HZXM'">
+				type IN ('HZXM', 'HZXM_OLD')
+			</when>
+			<otherwise>
+				type = #{type}
+			</otherwise>
+		</choose>
 		<if test="extend != null and extend != ''">
 			AND #{extend} = ANY(string_to_array(extend, ','))
 		</if>
 		<if test="name != null and name != ''">
 			AND name LIKE CONCAT('%', #{name}, '%')
 		</if>
+		ORDER BY SORT_NUM
 	</select>
 </mapper>