Merge remote-tracking branch 'remotes/origin/main' into v1.2.0

sean.zhou

2022-09-23 8ce3bb68bdc2250cc4a8a3d29085443fac64615a

 src/main/java/com/dji/sample/manage/model/entity/UserEntity.java

@@ -22,7 +22,7 @@
    private String password;

    @TableField(value = "workspace_id")
    private Integer workspaceId;
    private String workspaceId;

    @TableField(value = "user_type")
    private Integer userType;