Merge branch 'dev-follow-20200415' into release

src/views/followup/record-manage/record-list.vue

@@ -509,7 +509,8 @@ export default {
       } else {
         let hash = {
           1: "未完成",
-          2: "已完成"
+          2: "已完成",
+          3: "已结束"
         };
         return hash[value];
       }