Merge branch 'ht-dev' of http://139.196.74.78:10010/r/drone/drone-java into...

rain

2024-07-30 ceaf77720ca99f61a3b69147f8d7b3127bf8c5b7

 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;