Merge branch 'master' of git.taauav.net:gitadmin/jndz_admin_web

src/views/second/segmentation/contentDetail.vue

@@ -343,7 +343,7 @@
           </el-table>
         </div>
         <div slot="footer" class="footer">
-          <el-button @click="close">取消</el-button>&nbsp;
+          <el-button @click="close">返回</el-button>&nbsp;
         </div>
       </div>
     </el-card>