Merge branch 'feature/dxp' into 'release'

添加字断

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

src/views/learning/name-list.vue

@@ -66,6 +66,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="hospitalName" label="机构" align="center"></el-table-column>
+        <el-table-column prop="countyName" label="区/县" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="townName" label="乡镇/街道" show-overflow-tooltip></el-table-column>
         <el-table-column prop="addressName" label="地区" align="center"></el-table-column>
         <el-table-column v-if="tableType == 1" prop="finishFlag" label="参与课程状态" align="center">
           <template slot-scope="scope">