boss

src/view/tiip/kanban/index.vue

@@ -159,11 +159,7 @@ export default {
     mounted(){
         window.kanban=this
         this.$store.dispatch('saveUserId',this.$route.params.userId);
-<<<<<<< HEAD
         this.dateMode=3
-=======
-        this.dateMode = 3;
->>>>>>> 190116b4450793bd548aebed2072f0c3c05a6afc
     },
     methods:{
         preDate(){