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

huliguo

2 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java

@@ -171,6 +171,11 @@
     */
    @TableField("binding_type")
    private Integer bindingType;
    /**
     * 上次确认服务的id
     */
    @TableField("last_service_id")
    private String lastServiceId;

    @Override
    protected Serializable pkVal() {