最新的代码

platform-admin/src/main/resources/com/platform/dao/TbCfExpressTemplateDao.xml

@@ -71,7 +71,7 @@
         t.`update_time`,
         `desc`
         from tb_cf_express_template t
-        inner join country c
+        left join country c
         on t.country=c.id
         WHERE 1=1
         <if test="name != null and name.trim() != ''">

platform-admin/src/main/resources/dev/platform.properties

@@ -6,7 +6,8 @@
 #jdbc.username=root
 #jdbc.password=diaoyun666
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+
+jdbc.url: jdbc:mysql://159.138.48.71:3306/test?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
 jdbc.username: root
 jdbc.password: Diaoyunnuli.8
 

platform-admin/src/main/resources/prod/platform.properties

@@ -6,7 +6,8 @@
 #jdbc.username=root
 #jdbc.password=diaoyun666
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+
+jdbc.url: jdbc:mysql://159.138.48.71:3306/test?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
 jdbc.username: root
 jdbc.password: Diaoyunnuli.8
 

platform-admin/src/main/webapp/js/sys/term.js

@@ -9,7 +9,7 @@ $(function () {
             {label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
             // {label: '更新时间', name: 'updateTime', index: 'update_time', width: 80},
             {label: '状态', name: 'status', index: 'status', width: 80, formatter: statusFormat1},
-            // {label: '排序', name: 'sort', index: 'sort', width: 80}
+            {label: '排序', name: 'sort', index: 'sort', width: 80}
         ]
     });
 });
@@ -67,6 +67,7 @@ let vm = new Vue({
             vm.reload();
         },
         add: function () {
+            UE.getEditor('termContent').setContent('');
             vm.showContent = false;
             vm.showList = false;
             vm.disabled = true;