java/zhihuishenqu.git

			@@ -24,7 +24,8 @@
			<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$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -445,7 +446,7 @@
			<workItem from="1616487257652" duration="6990000" />
			<workItem from="1616501287620" duration="598000" />
			<workItem from="1616547019982" duration="10669000" />
			<workItem from="1616566015680" duration="7999000" />
			<workItem from="1616566015680" duration="10876000" />
			</task>
			<servers />
			</component>
			@@ -481,16 +482,6 @@
			<url>file://$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtCategoryServiceImpl.java</url>
			<line>52</line>
			<option name="timeStamp" value="7" />
			</line-breakpoint>
			<line-breakpoint enabled="true" type="java-line">
			<url>file://$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java</url>
			<line>175</line>
			<option name="timeStamp" value="8" />
			</line-breakpoint>
			<line-breakpoint enabled="true" type="java-line">
			<url>file://$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java</url>
			<line>180</line>
			<option name="timeStamp" value="9" />
			</line-breakpoint>
			</breakpoints>
			</breakpoint-manager>

	springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1,5 +1,6 @@
			package com.panzhihua.common.model.vos.community;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			@@ -146,6 +147,7 @@
			/**
			* create_at
			*/
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date createAt;

			@ApiModelProperty("发布人名字")

			@@ -58,7 +58,6 @@
			" </if> " +



			"<if test='pageComOpsHouseDTO.houseCommunityId != null '>" +
			"AND d.house_community_id=#{pageComOpsHouseDTO.houseCommunityId} \n" +
			" </if> " +