Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/entity/DrugConfig.java

@@ -85,7 +85,7 @@ public class DrugConfig implements Serializable {
     /**
      * 剂型
      */
-    @Excel(name = "药品剂型(不填、注射剂、片剂、缓释片、胶囊剂、滴丸剂)", width = 60, orderNum = "3", isImportField = "true")
+    @Excel(name = "药品剂型(不填、注射剂、片剂、缓释剂、胶囊剂、滴丸剂)", width = 60, orderNum = "3", isImportField = "true")
     private String form;
 
     public Long getId() {

src/main/resources/mapper/ConceptInfoMapper.xml

@@ -61,7 +61,7 @@
         ) t1
         LEFT JOIN sys_user t2 ON t1.modifier = t2.id
         ORDER BY
-        t1.status ASC,
+        t1.status DESC,
         t1.gmtModified DESC
     </select>