Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/setting/organizationManagement/settledManagement/index.vue

@@ -132,7 +132,7 @@
               <el-form-item label="以旧换新抵扣方式" prop="yjhxDkFlag">
                 <el-radio-group v-model="step1Form.yjhxDkFlag">
                   <el-radio :label="1">线上支付抵扣订单货款</el-radio>
-                  <el-radio :label="2">仅线上展示旧机价值</el-radio>
+                  <el-radio :label="2">仅线上展示旧机价格</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>

src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -117,7 +117,7 @@
               <el-form-item label="以旧换新抵扣方式" prop="yjhxDkFlag">
                 <el-radio-group v-model="step1Form.yjhxDkFlag">
                   <el-radio :label="1">线上支付抵扣订单货款</el-radio>
-                  <el-radio :label="2">仅线上展示旧机价值</el-radio>
+                  <el-radio :label="2">仅线上展示旧机价格</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>