Merge branch 'release' into 'dev-fixCircle-20210308'

Release



See merge request !249

src/components/activitymanagement/baseinfo.vue

@@ -69,6 +69,8 @@
             type="datetime"
             placeholder="请选择开始时间"
             style="width: 100%;"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"
             :picker-options="pickerOptions0"
           ></el-date-picker>
         </el-form-item>
@@ -83,6 +85,8 @@
             placeholder="请选择结束时间"
             default-time="23:59:59"
             style="width: 100%;"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"
             :picker-options="pickerOptions1"
           ></el-date-picker>
         </el-form-item>