From ebce7fab9222a0773a4943d28ed7ae6dd3cbfff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Thu, 3 Mar 2022 18:51:57 +0800
Subject: [PATCH 1/3] bug

---
 .../xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue b/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue
index ebead7e6..ebd82af5 100644
--- a/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue
+++ b/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue
@@ -142,12 +142,12 @@
               v-model="dialog.add.isForceUpdate" active-value="1" inactive-value="0">
           </el-switch>
         </el-form-item>
-        <el-form-item :required="dialog.add.type === '1'" v-if="dialog.add.type === '1'" label="appstore 地址"
+        <el-form-item :required="dialog.add.type === '0'" v-if="dialog.add.type === '0'" label="appstore 地址"
                       prop="downloadUrl">
           <el-input style="width: 240px" v-model.trim="dialog.add.downloadUrl" placeholder="请输入..." clearable>
           </el-input>
         </el-form-item>
-        <el-form-item :required="dialog.add.type === '0'" v-if="dialog.add.type === '0'" label="上传APK"
+        <el-form-item :required="dialog.add.type === '1'" v-if="dialog.add.type === '1'" label="上传APK"
                       prop="downloadUrl">
           <el-upload
               class="upload-demo"

From 961993ae2b6fcbbe2c5898543dabaa70974744da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Fri, 4 Mar 2022 09:19:56 +0800
Subject: [PATCH 2/3] bug

---
 .../xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue b/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue
index ebd82af5..b11e8a73 100644
--- a/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue
+++ b/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue
@@ -58,7 +58,7 @@
           </el-table-column>
           <el-table-column align="center" label="是否强制更新" :width="120">
             <template slot-scope="{row}">
-              <span v-if="row.type === '0'">{{ row.isForceUpdate === '0' ? '否' : '是' }}</span>
+              <span v-if="row.type === '1'">{{ row.isForceUpdate === '0' ? '否' : '是' }}</span>
               <span v-else>-</span>
             </template>
           </el-table-column>
@@ -136,7 +136,7 @@
           <el-input style="width: 240px" type="textarea" :rows="3" v-model="dialog.add.updateLog" placeholder="请输入..."
                     clearable></el-input>
         </el-form-item>
-        <el-form-item :required="dialog.add.type === '0'" v-if="dialog.add.type === '0'" label="是否强制更新"
+        <el-form-item :required="dialog.add.type === '1'" v-if="dialog.add.type === '1'" label="是否强制更新"
                       prop="isForceUpdate">
           <el-switch
               v-model="dialog.add.isForceUpdate" active-value="1" inactive-value="0">

From 8c21b368bd739abe7aa6799c4e19fa990885a851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Fri, 4 Mar 2022 09:55:38 +0800
Subject: [PATCH 3/3] 28017

---
 project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
index fb9d8c91..a92e482c 100644
--- a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
+++ b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
@@ -109,7 +109,7 @@ export default {
         {label: "姓名", slot: "name"},
         {label: "联系方式", prop: "phone", align: 'center', width: "120px"},
         {label: "账号角色", prop: "roleName", width: "120px", align: '120px'},
-        {label: "地区", prop: "areaName"},
+        {label: "地区", prop: "areaFullName"},
         {slot: "options"}
       ]
     },