java/zhihuishenqu.git

			@@ -23,8 +23,7 @@
			</component>
			<component name="ChangeListManager">
			<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
			<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -398,7 +397,7 @@
			<workItem from="1610326930387" duration="5497000" />
			<workItem from="1610368400707" duration="771000" />
			<workItem from="1610415637750" duration="6485000" />
			<workItem from="1610499071420" duration="57741000" />
			<workItem from="1610499071420" duration="58041000" />
			</task>
			<servers />
			</component>
			@@ -518,10 +517,10 @@
			<screen x="0" y="0" width="1536" height="824" />
			</state>
			<state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1610685985967" />
			<state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610693469091">
			<state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610694652469">
			<screen x="0" y="0" width="1536" height="824" />
			</state>
			<state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610693469091" />
			<state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610694652469" />
			<state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
			<screen x="0" y="0" width="1536" height="824" />
			</state>

			@@ -49,7 +49,7 @@
			"WHERE\n" +
			"mr.community_id = #{partyCommitteeVO.communityId} \n" +
			"<if test='partyCommitteeVO.name != null and partyCommitteeVO.name.trim() != ""'>" +
			"AND m.`name` = #{partyCommitteeVO.name} \n" +
			"AND m.`name` like concat(#{partyCommitteeVO.name},'%') \n" +
			" </if> " +
			"<if test='partyCommitteeVO.roleId != null and partyCommitteeVO.roleId != 0'>" +
			"AND r.role_id =#{partyCommitteeVO.roleId}" +

	springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史