Merge branch 'master' into 'master'

增加指标排序显示

See merge request lighter/web-server!50

src/main/java/thyyxxk/webserver/dao/his/targetmanagement/ZbZdBaseInfoDao.java

@@ -52,6 +52,7 @@ public interface ZbZdBaseInfoDao {
             ") " +
             "select tree.id, tree.name as label, tree.pid, tree.sort, tree.score " +
             "from zb_tree_view tree " +
+            "order by len(case when charindex('-', tree.sort) = 0 then tree.sort else substring(tree.sort,1,charindex('-',tree.sort)-1) end) " +
             "</script>")
     List<TargetDictTree> selectTargetDictTree(TargetManagement dto);