Merge remote-tracking branch 'origin/main'

xieb

2023-09-26 faedd5d2f0ee850464f0507da93c37459bd5e3bb

 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;