市场活动

src/main/java/com/dk/mdm/mapper/mst/ActivityMapper.xml

@@ -252,6 +252,7 @@
         left JOIN sys.t_data_kind as tdk1 on tma.activity_type = tdk1.kind_code
         left JOIN sys.t_data_kind as tdk2 on tma.activity_status = tdk2.kind_code
         <include refid="Condition_list"/>
+        order by tma.display_no
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/resources/dev/bootstrap.yml

@@ -2,7 +2,7 @@ server:
   port: 8008
 spring:
   application:
-    name: mdm-server
+    name: mdm-server-chn
   cloud:
     nacos:
       config: