Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/hpresume/hpResumeBankList.js

@@ -342,7 +342,7 @@ $(document).ready(function() {
     var d = new Date(r[1]);
     if(d.getFullYear()==r[1]) {
     var Y = new Date().getFullYear();
-    return (Y-r[1]);
+    return (Y-r[1]+1);
     }
 }
 </script>

src/main/webapp/webpage/modules/hpuser/hpApplyPositionList.js

@@ -434,7 +434,7 @@ $(document).ready(function() {
         var d = new Date(r[1]);
         if(d.getFullYear()==r[1]) {
             var Y = new Date().getFullYear();
-            return (Y-r[1]);
+            return (Y-r[1]+1);
         }
     }