Merge tag 'Hotfix-zh-311' into develop

Finish Hotfix-zh-311

src/views/basic_data/dealer/dealer_stock.vue

@@ -96,6 +96,9 @@
               <span>{{ scope.row.k3OrgNumber }}</span>
             </template>
           </el-table-column>
+          <el-table-column align="left" label="金蝶部门名称" prop="k3OrgName" min-width="200" show-overflow-tooltip>
+          </el-table-column>
+
           <el-table-column
             align="left"
             label="钱包名称"

src/views/supply/policy/components/retail_form.vue

@@ -213,9 +213,9 @@
         <!--            </el-select>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column align="right" label="可用返利" prop="rebateAmount" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="可用返利" prop="amount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <div>{{ scope.row.rebateAmount | numToFixed }}</div>
+            <div>{{ scope.row.amount | numToFixed }}</div>
           </template>
         </el-table-column>
         <el-table-column