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/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" 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" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -398,7 +398,7 @@
			<workItem from="1610326930387" duration="5497000" />
			<workItem from="1610368400707" duration="771000" />
			<workItem from="1610415637750" duration="6485000" />
			<workItem from="1610499071420" duration="57391000" />
			<workItem from="1610499071420" duration="57741000" />
			</task>
			<servers />
			</component>

			@@ -36,7 +36,7 @@
			"WHERE\n" +
			"d.community_id=#{comActDynVO.communityId}\n" +
			"<if test='comActDynVO.title != null and comActDynVO.title.trim() != ""'>" +
			"AND d.title = #{comActDynVO.title} \n" +
			"AND d.title like concat(#{comActDynVO.title},'%') \n" +
			" </if> " +
			"<if test='comActDynVO.isTopping != null '>" +
			"AND d.is_topping = #{comActDynVO.isTopping} \n" +

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