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

rain

2024-07-31 2463dc3827e1cb3dac87ed334546ca2a57539595

 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;