Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-27 aa925d851857f50eff0556411366690d9a78a0e5

 cloud-server-account/src/main/java/com/dsh/account/util/DateUtil.java

@@ -286,6 +286,7 @@
        Calendar cal = Calendar.getInstance();
        return cal;
    }

    /**
     * 毫秒转日期时间
     *
@@ -338,6 +339,7 @@

    /**
     * 计算年龄
     *
     * @param birthDate
     * @return
     */
@@ -361,9 +363,13 @@
        // 粗计算年龄
        int age = yearNow - yearBirth;
        // 当前月份小于出生月份年龄减一
        if (monthNow < monthBirth) { age--; }
        if (monthNow < monthBirth) {
            age--;
        }
        // 当前月份等于出生月份，日小于生日年龄减一
        else if (monthNow == monthBirth && dayNow < dayBirth) { age--; }
        else if (monthNow == monthBirth && dayNow < dayBirth) {
            age--;
        }
        // 返回年龄值
        return age;
    }