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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java

@@ -132,7 +132,6 @@
                case 2:
                    // 年内卡
                    Date date1 = new Date();

                    date1.setMonth(11);
                    date1.setDate(31);
                    date1.setHours(23);
@@ -167,6 +166,7 @@
        }
        return ResultUtil.success();
    }


    /**
     * 查看惠民卡详情
@@ -435,6 +435,15 @@
            return ResultUtil.success(new ArrayList<>());
        }
    }

    public static void main(String[] args) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        LocalDateTime localDateTime = LocalDateTime.now().plusDays(365);
        // 将LocalDateTime转换为Date类型
        Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
        String format = simpleDateFormat.format(date);
        System.err.println(format);
    }
    /**
     * 个人中心-我的惠民卡-查看详情
     */