Merge remote-tracking branch 'origin/master'

2023-04-11 15:35:39 +08:00
parent 4be7639a57 b85b20aa76
commit e7d4fc8979
3 changed files with 81 additions and 0 deletions
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
@@ -120,6 +120,7 @@ public class PublicUtil {
            if(month>=10 && i>=10){
                date = year +"-"+month+"-"+i;
            }
+            date = date + " 00:00:00";
            list.add(date);
        }
        return list;