Merge remote-tracking branch 'origin/master'

xuhy

2025-01-08 02d5b44343f3bd9abb667e50ccf469fed9a0a99a

 manage/src/main/java/com/jilongda/manage/controller/TCouponController.java

@@ -104,7 +104,7 @@
                    TCouponReceive tCouponReceive = new TCouponReceive();
                    tCouponReceive.setCouponId(dto.getId());
                    tCouponReceive.setUserId(userId);
                    tCouponReceive.setType(2);
                    tCouponReceive.setType(3);
                    tCouponReceive.setAmount(dto.getAmount());
                    tCouponReceive.setStoreId(dto.getStoreId());
                    if (dto.getTime()!=0){