Merge branch 'feature/zs-3.21.00000' into 'teasing/3.21.0'

Feature/zs 3.21.00000

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!341

src/views/goods/create-good.vue

@@ -71,7 +71,7 @@
                      <i class="el-icon-delete"></i>
                    </div>
                 </div>
-                <img  class="bg-img" src="../../assets/image/small.png" v-if="fileGoodsList.length <10"/>
+                <img  class="bg-img" src="../../assets/image/video.png" v-if="fileGoodsList.length <10"/>
                 <div class="limit-text">
                  <!-- <p>限制大小: 200kb</p> -->
                   <p>建议尺寸：750*420</p>

src/views/goods/goods-manage.vue

@@ -161,9 +161,9 @@
         </el-table-column>
         <el-table-column prop="saleTime" label="发布时间" width="170" align="center">
         </el-table-column>
-        <el-table-column prop="modifiedId" label="最近操作人" width="170" align="center">
+        <el-table-column prop="modifiedIdStr" label="最近操作人" width="170" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.modifiedId || '--' }}</span>
+            <span>{{ scope.row.modifiedIdStr || '--' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="modifiedTime" label="最近操作时间" width="170" align="center">