java/zhihuishenqu.git

			@@ -24,12 +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$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -414,7 +408,7 @@
			<workItem from="1611019208339" duration="94460000" />
			<workItem from="1611365644515" duration="33195000" />
			<workItem from="1611536010905" duration="21843000" />
			<workItem from="1611622682269" duration="46073000" />
			<workItem from="1611622682269" duration="47126000" />
			</task>
			<servers />
			</component>

			@@ -178,6 +178,12 @@
			});
			}
			comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
			Integer participantMax = comActActivityVO1.getParticipantMax();
			if (participantMax.intValue()==0) {
			comActActivityVO1.setType(1);
			}else{
			comActActivityVO1.setType(2);
			}
			});
			page.setRecords(content);
			}

	springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史