Merge branch 'greenUrgent' into allTestUrgent

# Conflicts:
#	src/components/dialogTemplate/index2.vue

src/HManagement/ecycle/publicClue/index.vue

@@ -128,7 +128,7 @@ export default {
       // this.$refs.basicLayout.param.content.type = 0
       this.$refs.basicLayout.param.content.deleted = 1
       this.$refs.basicLayout.param.content.where = this.selectParam
-      // this.$refs.basicLayout.param.content.sort = [{reversed:0,sorted:1,sortid:182,sortname:'作废时间倒序'}]
+      this.$refs.basicLayout.param.content.sort = [{reversed:0,sorted:1,sortid:231,sortname:'作废时间倒序'}]
       this.$refs.basicLayout.listData()
     },
     /*获取分类*/

src/components/dialogTemplate/index2.vue

@@ -38,7 +38,7 @@ export default {
 </script>
 
 <style scoped>
-/deep/ .el-dialog__body {
-  padding: 0 20px 20px 20px !important;
-}
+  /deep/ .el-dialog__body {
+    padding: 0 20px 20px 20px !important;
+  }
 </style>