Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java

@@ -64,6 +64,8 @@
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

/**
 * <p>
@@ -525,6 +527,7 @@
    }

    @Override
    @Transactional(propagation = Propagation.REQUIRES_NEW)
    public void updMembeOne(updMembeOneDTO dMembeOneDTO) {
        Member byId = this.getById(dMembeOneDTO.getMemberId());
        if (dMembeOneDTO.getMoney()!=null){