Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-04-07 3e72240f9926463bba8d2d5cbec743dbcdcf9bd3

 company/src/components/business/OperaCompanyWindow.vue

@@ -100,7 +100,7 @@
                align="center"
                label="委托商户">
                <template slot-scope="scope">
                  <el-select  v-model="scope.row.shopId" clearable="true" value-key="id" placeholder="请选择" >
                  <el-select  v-model="scope.row.shopId" clearable value-key="id" placeholder="请选择" >
                    <el-option
                        v-for="item in shops"
                        :key="item.id"