Merge branch 'score_shop'

Helius

2022-10-19 39a5520c112081aff9f55ad13c1b4b53e4136a87

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

        }