add merchantId of white user

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/WhiteUserSearchDTO.java

@@ -9,6 +9,8 @@ import java.io.Serializable;
 @ToString
 public class WhiteUserSearchDTO implements Serializable {
 
+    private String merchantId;
+
     private String code;
 
     private Integer pageNo = 1;

rankin-user-service/src/main/java/cn/rankin/userservice/controller/WhiteUserController.java

@@ -87,6 +87,10 @@ public class WhiteUserController {
         if (!StringUtils.isEmpty(code)) {
             sample.setCode("%" + code + "%");
         }
+        String merchantId = searchDTO.getMerchantId();
+        if (!StringUtils.isEmpty(merchantId)) {
+            sample.setMerchantId(merchantId);
+        }
         Integer pageNo = searchDTO.getPageNo();
         Integer pageSize = searchDTO.getPageSize();
         LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();