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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 cloud-server-other/src/main/java/com/dsh/other/util/DateComparisonExample.java

@@ -31,7 +31,7 @@
                && (valueEndDate.before(endDate) || valueEndDate.equals(endDate));
    }

    public static  boolean isStringWithinTimeRange(String stringValue, Date startTime, Date endTime) {
    public static boolean isStringWithinTimeRange(String stringValue, Date startTime, Date endTime) {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
        try {
            Date dateValue = sdf.parse(stringValue);