Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserCustomSettingsService.java

@@ -71,4 +71,11 @@
    */

   public List<UserCustomSettings> listByUidListAndTypeAndState(List<Long> uidList, String type, Integer state);



   /**

    * 是否对外显示手机号

    * @param uid

    * @return

    */

   public boolean validateDisplayPhoneByUid(Long uid);



}