diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index db7ee4d..84dd262 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -95,7 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT and member.nickname like concat('%', #{nickname}, '%') - and member.credit >= #{creditStart} and member.credit <= #{creditEnd} + and member.credit >= #{creditStart} + and member.credit <= #{creditEnd} and member.user_type = #{userType} and member.province_id = #{provinceId} and member.city_id = #{cityId} @@ -121,8 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and member.create_time <= #{params.endTime} - and member.devices_num >= #{deviceNumStart} and member.devices_num <= #{deviceNumEnd} - + and member.devices_num >= #{deviceNumStart} + and member.devices_num <= #{deviceNumEnd} and id in ( SELECT diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 8e71803..1d6ed4c 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -115,14 +115,14 @@ - + 至 - + - + 至 - +