Pre Merge pull request !252 from 刘继东/N/A

Merge pull request !397 from 威士忌的纯度/N/A

docker/nginx/conf/nginx.conf

@@ -29,7 +29,7 @@ http {
         }
 
         # 避免actuator暴露
-        if ($request_uri ~ "/actuator") {
+        if ($uri ~ "/actuator") {
             return 403;
         }
 

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
 			</if>
 		</where>
+		order by create_time desc        
 	</select>
 
 	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
@@ -132,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		order by c.sort
+		order by t.table_name,c.sort
 	</select>
 	
 	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">