Merge branch '02/24resetMain' into 11/24SAAS

src/views/chargeManager/four.vue

@@ -6,13 +6,13 @@
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 20px 0 40px"
-          title="商品收款账户设置"
+          title="商品销售收款账户设置"
           :closable="false"
           type="info"
         >
         </el-alert>
         <el-row>
-                商品收款账户:
+                商品销售收款账户：
           <el-form-item
             prop="231"
             :rules="[
@@ -23,7 +23,7 @@
             ]"
           >
 
-            <el-input v-model="form['231']" placeholder="请输入商品收款账户">
+            <el-input v-model="form['231']" placeholder="请输入收款账户">
             </el-input>
 
           </el-form-item>