Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-11-02 2e08d6d4c0710d3e535b5944faa9df4af828c0f7

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

        }