java/zhihuishenqu.git

			@@ -24,7 +24,7 @@
			<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/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" />
			@@ -390,7 +390,7 @@
			<workItem from="1610326930387" duration="5497000" />
			<workItem from="1610368400707" duration="771000" />
			<workItem from="1610415637750" duration="6485000" />
			<workItem from="1610499071420" duration="11844000" />
			<workItem from="1610499071420" duration="12615000" />
			</task>
			<servers />
			</component>
			@@ -510,10 +510,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="1609226181026" />
			<state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610529907748">
			<state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610530875315">
			<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="1610529907748" />
			<state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610530875315" />
			<state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
			<screen x="0" y="0" width="1536" height="824" />
			</state>

			@@ -60,10 +60,10 @@
			"and o.name=#{pagePartyOrganizationVO.orgName}"+
			" </if> " +
			"<if test='pagePartyOrganizationVO.account != null and pagePartyOrganizationVO.account.trim() != ""'>" +
			"and u.phone=#{pagePartyOrganizationVO.account}"+
			"and u.phone like concat (#{pagePartyOrganizationVO.account},'%')"+
			" </if> " +
			"<if test='pagePartyOrganizationVO.name != null and pagePartyOrganizationVO.name.trim() != ""'>" +
			"and m.name=#{pagePartyOrganizationVO.name}"+
			"and m.name like concat (#{pagePartyOrganizationVO.name},'%')"+
			" </if> " +

			"order by m.join_time desc "+

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