Merge branch 'master' into feature/订单服务单代码改造

姜友瑶

2022-05-23 ea865027c9e115057644f59747f3bed2a8a963e6

 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);

        }