Merge remote-tracking branch 'origin/master'

user_center/src/main/resources/mapper/DictMapper.xml

@@ -61,7 +61,7 @@
             and STATUS =1
             and DICT_CODE!='-999'
         </where>
-        order by DICT_NAME,DICT_VALUE
+        order by DATE_CREATE
     </select>
 
     <!-- 新增所有列 -->
@@ -176,7 +176,7 @@
             and STATUS =1
             and DICT_CODE!='-999'
         </where>
-        order by DICT_NAME,DICT_VALUE
+        order by DATE_CREATE
     </select>
     <!-- 字典编码和父配置ID数量 -->
     <select id="countByCodePid" resultType="int">