Merge remote-tracking branch 'origin/master'

mall-server-api/src/main/java/com/gree/mall/manager/utils/CommonUtils.java

@@ -126,15 +126,12 @@ public class CommonUtils {
      */
     public static String getYear(HttpServletRequest request){
         String orderYear = request.getHeader("orderYear");
-        if(StringUtils.isBlank(orderYear)){
-            return "2025";
-        }
-       /* if(StrUtil.isBlankOrUndefined(orderYear)){
+        if(StrUtil.isBlankOrUndefined(orderYear)){
             return "";
         }
         if (String.valueOf(DateUtil.year(DateUtil.date())).equals(orderYear)) {
             orderYear = "";
-        }*/
+        }
         return orderYear;
     }