Merge remote-tracking branch 'origin/test' into test

src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java

@@ -88,6 +88,10 @@ public class MemberService {
     public Result queryMember(String shopId, String phone,String isFlag, int page, int pageSize) {
 
         PageHelperUtil.startPage(page, pageSize);
+
+        if(!"1".equals(isFlag)){
+            isFlag=null;
+        }
         List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone,isFlag);
         PageInfo pageInfo = new PageInfo(tbShopUsers);
         return Result.success(CodeEnum.SUCCESS, pageInfo);