Merge branch 'stage-6' into dev

# Conflicts:
#	pages2/verify/input.vue

pages2/verify/input.vue

@@ -1631,11 +1631,7 @@ export default {
               if (result.data.code === 200) {
                 if (!result.data.data) {
                   self.$api
-                    .getbaseprofiletplistProfile({
-                      pageNum: 1,
-                      pageSize: 1,
-                      status: 1,
-                    })
+                    .getbaseprofiletplistProfile({ pageNum: 1, pageSize: 1 })
                     .then((kit) => {
                       if (kit.data.rows.length) {
                         var ajson = JSON.parse(kit.data.rows[0].keyValue);