'commit'

src/main/java/com/dsideal/QingLong/Base/Controller/BaseController.java

@@ -31,7 +31,7 @@ public class BaseController extends Controller {
     @Before({GET.class})
     @IsLoginInterface({})
     public void getCurrentPersonInfo() {
-        Map map = new HashMap<>();
+        Map<String,Object> map = new HashMap<>();
         map.put("identity_id", SessionKit.get(getRequest(), getResponse(), "identity_id"));
         map.put("person_id", SessionKit.get(getRequest(), getResponse(), "person_id"));
         map.put("bureau_id", SessionKit.get(getRequest(), getResponse(), "bureau_id"));

src/main/java/com/dsideal/QingLong/Base/Model/BaseModel.java

@@ -452,7 +452,7 @@ public class BaseModel {
      * @return
      */
     public Map getLoginInfoByUserName(String userName) {
-        Map loginMap = new HashMap();
+        Map<String,Object> loginMap = new HashMap<>();
         String sql = Db.getSql("Base.getLoginInfoByUserName");
         List<Record> list = Db.find(sql, userName);
         if (list.size() > 0) {

src/main/java/com/dsideal/QingLong/Util/CommonUtil.java

@@ -25,7 +25,6 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 @SuppressWarnings("unchecked")
 public class CommonUtil {
     //在独立的main函数中，使用下面的方式进行声明logback对象