提交

.env.development

@@ -6,19 +6,11 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-<<<<<<< HEAD
-#VUE_APP_BASE_API = 'http://47.92.229.224:8080'
-#罗俊
-#VUE_APP_BASE_API = 'http://10.87.21.60:8080'
-#罗伟
-  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
-=======
 # VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
->>>>>>> d909b77fe3593021b73d72d6276f6df848c73f8a
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

src/views/system/device/index.vue

@@ -327,7 +327,7 @@
                 clearable
                 v-model="form.checkTime"
                 type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd"
                 placeholder="请选择到期时间"
               >
               </el-date-picker>