0358677c06e86f05c992f406c9714a32b30a235d..bf99ae66d14857dfcd97dc6ccb8e82a38d3bd75f
2024-07-19 jiangping
Merge remote-tracking branch 'origin/master'
bf99ae 对比 | 目录
2024-07-19 jiangping
提交
40f16f 对比 | 目录
已修改2个文件
18 ■■■■ 文件已修改
admin/src/views/business/customer.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/customer.vue
@@ -40,18 +40,20 @@
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="120px"></el-table-column>
        <el-table-column prop="name" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="phone" label="电话" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" fixed min-width="140px"></el-table-column>
        <el-table-column prop="name" label="姓名" fixed min-width="100px"></el-table-column>
        <el-table-column prop="phone" label="电话" fixed min-width="100px"></el-table-column>
        <el-table-column prop="proName" label="省份" min-width="180px">
          <template slot-scope="{row}">
            {{row.proName||''}}{{row.cityName||''}}{{row.areaName||''}}
          </template>
        </el-table-column>
        <el-table-column prop="addr" label="地址" min-width="100px"></el-table-column>
        <el-table-column prop="ip" label="IP地址" min-width="100px"></el-table-column>
        <el-table-column prop="proName" label="省份" min-width="100px"></el-table-column>
        <el-table-column prop="cityName" label="城市" min-width="100px"></el-table-column>
        <el-table-column prop="areaName" label="区域" min-width="100px"></el-table-column>
        <el-table-column prop="sysVersion" label="系统版本" min-width="100px"></el-table-column>
        <el-table-column prop="browser" label="浏览器" min-width="100px"></el-table-column>
        <el-table-column prop="terminal" label="终端类型" min-width="100px"></el-table-column>
        <el-table-column prop="openid" label="微信openid" min-width="100px"></el-table-column>
        <el-table-column prop="openid" label="微信openid" min-width="240px"></el-table-column>
        <el-table-column prop="info" label="备注" min-width="100px"></el-table-column>
<!--        <el-table-column
          v-if="containPermissions(['business:customer:update', 'business:customer:delete'])"
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -445,8 +445,6 @@
        return ztUserGetTokenResponse;
    }
    @Override
    public Member getMemberInfo(Long memberId){
        Member member = memberMapper.selectById(memberId);