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_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.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" />
			@@ -389,7 +388,7 @@
			<workItem from="1610088905473" duration="10469000" />
			<workItem from="1610326930387" duration="5497000" />
			<workItem from="1610368400707" duration="771000" />
			<workItem from="1610415637750" duration="447000" />
			<workItem from="1610415637750" duration="1082000" />
			</task>
			<servers />
			</component>

			@@ -40,6 +40,7 @@
			"a.`status`,\n" +
			"a.publish_at,\n" +
			"a.begin_at,\n" +
			"a.cover,\n" +
			"a.end_at,\n" +
			"a.volunteer_max,\n" +
			"count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+

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