Merge branch 'dev/v2.4.42_yf' of jianyu/qmx_page_admin into feature/v2.4.42

src/views/huiju/qrCodeList.vue

@@ -32,9 +32,11 @@
             width="300">
         </el-table-column>
         <el-table-column
-            prop="scan_num"
-            label="扫码次数"
-            width="80">
+            label="扫码/关注"
+            width="100">
+            <template slot-scope="scope">
+              <span>{{ scope.row.scan_num }} / {{scope.row.sub_num}}</span>
+            </template>
         </el-table-column>
         <el-table-column
             prop="create_time"