[数据模型] 改了一些bug

src/main/java/com/tykj/base/util/DateFormatUtil.java

@@ -85,7 +85,7 @@ public class DateFormatUtil {
      * @return
      * @throws ParseException
      */
-    public static Date pareDate(@NotNull String pattern, @NotNull String dateString) throws ParseException {
+    public static Date pareDate( String pattern,  String dateString) throws ParseException {
         return FastDateFormat.getInstance(pattern).parse(dateString);
     }
 
@@ -95,7 +95,7 @@ public class DateFormatUtil {
      * @return
      * @throws ParseException
      */
-    public static Date pareDate(@NotNull String dateString) throws ParseException {
+    public static Date pareDate( String dateString) throws ParseException {
         String source = dateString.trim();
         if (StringUtils.isNotBlank(source)) {
             if(source.matches(DATE_REGEX_YYYYMM)){