Merge branch 'feature/8月上迭代'

src/components/company/related-table.vue

@@ -30,6 +30,11 @@
             {{ scope.row.enterpriseName || '--' }}
           </template>
         </el-table-column>
+        <el-table-column prop="" label="企业简称" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.brandName || '--' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="" label="关联门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName || '--' }}<el-tag type="danger" v-if="scope.row.mainStoreFlag">主门店</el-tag></p>

src/views/apps/customerApp/memberGroupSet.vue

@@ -47,6 +47,9 @@
               <el-table-column prop="" label="是否实时" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.isRealTime == 1 ? '是' : '否' }}</template>
               </el-table-column>
+              <el-table-column prop="" label="是否固化" show-overflow-tooltip>
+                <template slot-scope="scope">{{ scope.row.curingFlag == 1 ? '是' : '否' }}</template>
+              </el-table-column>
               <el-table-column prop="" label="更新频率" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.updateType == 1 ? '每日' : scope.row.updateType == 2 ? '每周' : scope.row.updateType == 3 ? '每月' : '-' }} {{ scope.row.updateType == 1 ? '一次' : scope.row.updateType == 2 ? '周' + scope.row.updateDay : scope.row.updateType == 3 ? scope.row.updateDay + '号' : '-' }} </template>
               </el-table-column>