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$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -409,7 +408,7 @@
			<workItem from="1611019208339" duration="94460000" />
			<workItem from="1611365644515" duration="33195000" />
			<workItem from="1611536010905" duration="21843000" />
			<workItem from="1611622682269" duration="28532000" />
			<workItem from="1611622682269" duration="28870000" />
			</task>
			<servers />
			</component>

			@@ -69,10 +69,10 @@
			"AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" +
			" </if> " +
			"<if test='comActActivityVO.type != null and comActActivityVO.type==1 '>" +
			"AND a.participant_max=0 \n" +
			"AND a.volunteer_max!=0 \n" +
			" </if> " +
			"<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" +
			"AND a.volunteer_max=0 \n" +
			"AND a.participant_max!=0 \n" +
			" </if> " +
			" group by a.id "+
			" order by a.status asc,a.publish_at desc "+

	springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史