Merge remote-tracking branch 'origin/master'

src/views/museums/photogroup/PhotosIndex.vue

@@ -26,12 +26,12 @@
 <!--          class="!w-240px"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="上传时间" prop="createdAt">
+      <el-form-item label="创建时间" prop="createdAt">
         <el-date-picker
           v-model="queryParams.createdAt"
           value-format="YYYY-MM-DD"
           type="date"
-          placeholder="选择上传时间"
+          placeholder="选择创建时间"
           clearable
           class="!w-240px"
         />
@@ -97,7 +97,7 @@
       </el-table-column>
 
       <el-table-column
-        label="上传时间"
+        label="创建时间"
         align="center"
         prop="createdAt"
         :formatter="dateFormatter"

src/views/museums/photogroup/index.vue

@@ -28,12 +28,12 @@
           class="!w-220px"
         />
       </el-form-item>
-      <el-form-item label="上传时间" prop="createdAt" label-width="100px">
+      <el-form-item label="创建时间" prop="createdAt" label-width="100px">
         <el-date-picker
           v-model="queryParams.createdAt"
           value-format="YYYY-MM-DD"
           type="date"
-          placeholder="选择上传时间"
+          placeholder="选择创建时间"
           clearable
           class="!w-240px"
         />
@@ -101,7 +101,7 @@
 <!--        width="180px"-->
 <!--      />-->
       <el-table-column
-        label="上传时间"
+        label="创建时间"
         align="center"
         prop="createTime"
         :formatter="dateFormatter"