Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSyst...

zf

2023-08-30 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b

 src/main/java/com/gk/hotwork/Controller/Base/BaseController.java

@@ -94,6 +94,11 @@
                user.setRealname(jo.getString("realname"));
                user.setType(jo.getInteger("type"));
                user.setCompanyid(jo.getLong("companyid"));
                user.setCompany(jo.getString("company"));
                user.setProvince(jo.getString("province"));
                user.setCity(jo.getString("city"));
                user.setCounty(jo.getString("county"));
                user.setProfessionalLevel(jo.getInteger("professionalLevel"));
                user.setDepartment(jo.getLong("department"));
                user.setDepartmentname(jo.getString("departmentname"));
                return user;
@@ -110,6 +115,13 @@
        msg.setMessage("success");
        return msg;
    }
    
    public Msg failed(String errorMsg) {
        Msg msg = new Msg();
        msg.setCode("500");
        msg.setMessage(errorMsg);
        return msg;
    }

    public Msg success(Object object) {
        Msg msg = new Msg();