Merge remote-tracking branch 'origin/master'

jiangping

2024-03-04 e07b48b907f0d1335b399f7ada373ce03f51d228

 server/service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -1298,7 +1298,7 @@
        calo.setTime(oldDate);
        caln.setTime(newDate);
        if(type==0||type==1){
            return    calculateDaysBetweenDates(caln, calo) ;
            return    calculateDaysBetweenDates(caln, calo)  + 1 ;
        }else if(type==2){

            int day = caln.get(Calendar.DATE);