Merge branch 'developer'

姜友瑶

2022-06-15 7bb22e67688232190a00ee3e63b5b93ea6037273

 zq-erp/src/main/java/com/matrix/core/tools/DateUtil.java

@@ -720,7 +720,7 @@
                targetDate = calendar.getTime();
                break;
            default:
                targetDate = stringToDate("9999-12-31", DATE_FORMAT_DD);
                targetDate = stringToDate("2099-12-31", DATE_FORMAT_DD);

        }