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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

 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);



}