Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-11-03 53e25d994cfbf6608f6fd1eef2e27ec129fd41c6

 server/services/src/main/java/com/doumee/core/Jwt/JwtPayLoad.java

@@ -18,14 +18,14 @@
    /**
     * 用户id
     */
    private Integer memberId;
    private String memberId;
    private long expire;


    public JwtPayLoad() {
    }

    public JwtPayLoad(Integer memberId) {
    public JwtPayLoad(String memberId) {
        this.memberId = memberId;
    }

@@ -52,7 +52,7 @@
            return new JwtPayLoad();
        } else {
            JwtPayLoad jwtPayLoad = new JwtPayLoad();
            jwtPayLoad.setMemberId((Integer) map.get("memberId"));
            jwtPayLoad.setMemberId(map.get("memberId").toString());

            return jwtPayLoad;
        }