Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

Administrator

2021-08-14 1fe3d312acbfb69f3bd74b21ea682512091a546f

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w


 Conflicts:

	src/main/java/org/springblade/modules/system/controller/UserController.java

 src/main/java/org/springblade/modules/auth/utils/TokenUtil.java

@@ -96,6 +96,7 @@
        param.put(TokenConstant.DETAIL, userInfo.getDetail());
        param.put("jurisdiction", user.getJurisdiction());
        param.put("cardid", user.getCardid());
        param.put("Id", user.getId());

        //拼装accessToken
        try {
@@ -108,6 +109,7 @@
                .set(TokenConstant.ROLE_ID, user.getRoleId())
                .set("jurisdiction", user.getJurisdiction())
                .set("cardid", user.getCardid())
                .set("Id", user.getId())
                .set(TokenConstant.OAUTH_ID, userInfo.getOauthId())
                .set(TokenConstant.ACCOUNT, user.getAccount())
                .set(TokenConstant.USER_NAME, user.getAccount())

 src/main/java/org/springblade/modules/record/entity/Record.java

@@ -156,6 +156,10 @@
    private Date permitime;
    private String reason;
    private String examinetime;
    private String cardid;
    private String representativecell;
    private String contacts;
    private String contactscell;


}

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml

@@ -27,6 +27,10 @@
        <result column="permitime" property="permitime"/>
        <result column="ptype" property="ptype"/>
        <result column="examinetime" property="examinetime"/>
        <result column="cardid" property="cardid"/>
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
    </resultMap>



 src/main/java/org/springblade/modules/recordk/entity/Recordk.java

@@ -154,5 +154,10 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;
    private String reason;
    private String cardid;
    private String representativecell;
    private String contacts;
    private String contactscell;


}

 src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml

@@ -26,6 +26,10 @@
        <result column="deptid" property="deptid"/>
        <result column="permitime" property="permitime"/>
        <result column="ptype" property="ptype"/>
        <result column="cardid" property="cardid"/>
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
    </resultMap>



 src/main/java/org/springblade/modules/revoke/entity/Revoke.java

@@ -140,4 +140,9 @@
    private Date permitime;
    private String deptid;
    private String ptype;
    private String cardid;
    private String representativecell;
    private String contacts;
    private String contactscell;

}

 src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml

@@ -25,6 +25,10 @@
        <result column="deptid" property="deptid"/>
        <result column="permitime" property="permitime"/>
        <result column="ptype" property="ptype"/>
        <result column="cardid" property="cardid"/>
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
    </resultMap>