From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
index ad124f7..e467cd8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
@@ -31,6 +31,12 @@
IPage<PartyCommitteeVO> pagePartyOrganization(Page page,
@Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO);
+
+
+ IPage<com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO> pagePartyOrganizations(Page page,
+ @Param("partyCommitteeVO") com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO partyCommitteeVO);
+
+
@Select("select * from sys_user where phone=#{phone} AND app_id = #{appid} and type=1")
SysUserVO getSysUserByPhone(@Param("phone") String phone, @Param("appid") String appid);
--
Gitblit v1.7.1