Merge remote-tracking branch 'origin/dev' into dev

2022-02-14 18:19:36 +08:00
parent 31a496e6b3 ea52e27e77
commit a634abfbef
30 changed files with 2642 additions and 19 deletions
--- a/project/sass/apps/AppConference/addMeeting.vue
+++ b/project/sass/apps/AppConference/addMeeting.vue
@@ -19,7 +19,7 @@
                    :picker-options="pickerOptions"
                    type="datetime"
                    size="small"
-                    placeholder="选择日期">
+                    placeholder="选择开始时间">
                </el-date-picker>
              </el-form-item>
              <el-form-item label="结束时间：" prop="endTime">
@@ -31,7 +31,7 @@
                    type="datetime"
                    :disabled="!Boolean(saveData.startTime)"
                    size="small"
-                    placeholder="选择日期">
+                    placeholder="选择结束时间">
                </el-date-picker>
              </el-form-item>
            </el-row>