Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-h5 into test

components/architectures/resettleSO.vue

@@ -25,9 +25,9 @@
                 treeData.nodeCode === '0-root' ? '' : treeData.nodeCode
               }}</view> -->
               <view v-if="treeData.memberCode && treeData.memberName">
-                <view> {{ treeData.memberCode }}</view>
+                <view>{{ treeData.memberCode }}</view>
                 <view>{{ stageName }}</view>
-                <!-- <view>{{ treeData.memberName }}</view> -->
+                <view>{{ treeData.pointMember }}</view>
                 <view>{{ treeData.creationTime }}</view>
               </view>
               <view v-else> 空点位 </view>

pages/architecture/resettleArchite/resettle2.vue

@@ -152,7 +152,7 @@
             <view v-if="pointDetail" class="detail-row">
               <text class="detail-label">隶属体系：</text>
               <text class="detail-value">{{
-                pointDetail.system || pointDetail.parentSystem || 'BF30720213'
+                pointDetail.system || pointDetail.parentSystem
               }}</text>
             </view>
             <view v-if="pointDetail" class="detail-row">