Merge branch 'feat/lyf' into 'develop'

添加返现字段

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

src/views/goods/order-manage.vue

@@ -259,13 +259,13 @@
           </template>
         </el-table-column>
 
-        <!-- <el-table-column
-          prop="fanxxxx"
+        <el-table-column
+          prop="commissionAmount"
           label="返现"
           min-width="100"
           align="center"
         >
-        </el-table-column> -->
+        </el-table-column>
 
         <el-table-column
           prop="saleTypeStr"