java/zhihuishenqu.git

			@@ -24,7 +24,6 @@
			<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/ComActEasyPhotoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -406,7 +405,7 @@
			<workItem from="1610956684718" duration="7037000" />
			<workItem from="1611019208339" duration="94460000" />
			<workItem from="1611365644515" duration="33195000" />
			<workItem from="1611536010905" duration="20856000" />
			<workItem from="1611536010905" duration="21843000" />
			</task>
			<servers />
			</component>

			@@ -155,7 +155,7 @@
			"AND u.phone LIKE concat( #{pageComActDiscussCommentDTO.account}, '%' )\n" +
			" </if> " +
			"LEFT JOIN com_act_discuss_comment_user cu ON c.id = cu.disscuss_comment_id \n" +
			" where c.discuss_id=#{pageComActDiscussCommentDTO.id}" +
			" where c.discuss_id=#{pageComActDiscussCommentDTO.id} and parent_id=0 " +
			"<if test='pageComActDiscussCommentDTO.comment != null and pageComActDiscussCommentDTO.comment.trim() != ""'>" +
			" and c.`comment` LIKE concat( '%', #{pageComActDiscussCommentDTO.comment" +
			"}, '%' ) \n" +

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