Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/user/templateSummary.vue

     },
     methods: {
       getTime(val) {
-         // console.log("val2322332322323223",val)
+         console.log("val2322332322323223",val)
          if(val == "" || val == undefined){
           return ""
          }else {