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_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.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="58499000" />
			<workItem from="1610499071420" duration="58814000" />
			</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="1610694917613">
			<state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610695423616">
			<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="1610694917613" />
			<state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610695423616" />
			<state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
			<screen x="0" y="0" width="1536" height="824" />
			</state>

			@@ -57,7 +57,7 @@
			"LEFT JOIN com_pb_org o ON m.org_id = o.id"+
			" where m.community_id=#{pagePartyOrganizationVO.communityId} " +
			"<if test='pagePartyOrganizationVO.orgName != null and pagePartyOrganizationVO.orgName.trim() != ""'>" +
			"and o.name = #{pagePartyOrganizationVO.orgName}"+
			"and o.name like concat(#{pagePartyOrganizationVO.orgName},'%') "+
			" </if> " +
			"<if test='pagePartyOrganizationVO.account != null and pagePartyOrganizationVO.account.trim() != ""'>" +
			"and u.phone like concat (#{pagePartyOrganizationVO.account},'%')"+

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