Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java

@@ -30,8 +30,8 @@
    private TAppGiftMapper mapper;

    @Override
    public Integer weeksOfAddHours(Long packetId,Integer appUserId,Integer num) {
        Integer b = coursePaymentClient.sendHours(packetId+"_"+appUserId+"_"+num);
    public Integer weeksOfAddHours(Long packetId, Integer appUserId, Integer num) {
        Integer b = coursePaymentClient.sendHours(packetId + "_" + appUserId + "_" + num);
        return b;
    }