Merge remote-tracking branch 'origin/master'

linwei

2024-02-21 86498f43cb9e6a5f8c58cca7b5c07a5ad1e23b2f

 src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationMemberServiceImpl.java

@@ -43,7 +43,7 @@

      userHouseLabelEntity.setHouseCode(partyOrganizationMember.getHouseCode());
      userHouseLabelEntity.setLabelId(Long.parseLong(partyOrganizationMember.getPartyMemberType()));
      userHouseLabelEntity.setColor("#30D17C");
      userHouseLabelEntity.setColor("green");
      userHouseLabelEntity.setLableType(1);
      userHouseLabelEntity.setHouseholdId(Long.parseLong(partyOrganizationMember.getHouseholdId()));
      userHouseLabelEntity.setCreateTime(DateUtil.now());