Merge branch 'dev' into test

share-system/src/main/java/share/system/service/impl/EquityMembersOrderServiceImpl.java

@@ -226,6 +226,8 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                 newConsumerMember.setIsRights(YesNoEnum.yes.getIndex());
                 newConsumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, new Date())),
                         Integer.parseInt(expirationDateEquityMembership)));
+                consumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, new Date())),
+                        Integer.parseInt(expirationDateEquityMembership)));
                 newConsumerMember.setId(consumerMember.getId());
                 consumerMemberService.updateById(newConsumerMember);
                 if (consumerMember.getIsRights().equals(YesNoEnum.no.getIndex()) && consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex())) {