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

rain

2024-07-26 56cf48282b9fa39637fdcad9b445d2a2f81a61d9

 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;