Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-27 db9d95db6f25f95cbc614525adef7dbdeae6478c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java

@@ -114,7 +114,7 @@
                age = age + 1;
            }
        }
        return age;
        return age - 1;
    }

    public static int getAgeFromBirthTimes(long birthTimeLong) {
@@ -129,6 +129,5 @@
        String year = yese.substring(0,4);
        String month = yese.substring(4,6);
        String ri = yese.substring(6,8);
        System.out.println();
    }
}