Merge remote-tracking branch 'origin/main'

guoshilong

2023-09-23 435c3e59682795fddaa9663e2f1e8401b90896e9

 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;