springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -22,7 +22,10 @@ <select /> </component> <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="" /> <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$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> @@ -406,7 +409,7 @@ <workItem from="1611019208339" duration="94460000" /> <workItem from="1611365644515" duration="33195000" /> <workItem from="1611536010905" duration="21843000" /> <workItem from="1611622682269" duration="41385000" /> <workItem from="1611622682269" duration="43110000" /> </task> <servers /> </component> springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
@@ -44,5 +44,7 @@ private String status; @ApiModelProperty(value = "党员唯一标识id") private Long id; @ApiModelProperty(value = "报名时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -326,7 +326,7 @@ PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO(); BeanUtils.copyProperties(comPbMemberDO, partyBuildingMemberVO); ComPbActivityMemberDO comPbActivityMemberDO1 = comPbActivityMemberDOS.stream().filter(comPbActivityMemberDO -> comPbActivityMemberDO.getMemberId().equals(comPbMemberDO.getId())).collect(Collectors.toList()).get(0); partyBuildingMemberVO.setJoinTime(comPbActivityMemberDO1.getCreateAt()); partyBuildingMemberVO.setCreateAt(comPbActivityMemberDO1.getCreateAt()); partyBuildingMemberVOS.add(partyBuildingMemberVO); }); }
