From c5e8177c3fbc27ac825f38c465383903adb87596 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 01 十一月 2022 13:59:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 08faefd..db03c51 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -422,14 +422,14 @@
     int isExpertAccount(String account);
 
     /**
-     * 是否为党员
-     * */
-    int isDpcMember(@Param("phone") String phone,@Param("name")String name);
-
-    /**
      * 查询两个appid的用户做更新
      * @param userId
      * @return
      */
     List<SysUserDO> selectByUserId(@Param("userId") Long userId);
+
+    /**
+     * 是否为党员
+     * */
+    int isDpcMember(@Param("phone") String phone,@Param("name")String name);
 }

--
Gitblit v1.7.1