Merge remote-tracking branch 'origin/master'

zhongrj

2024-03-11 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116

 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());