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

xuhy

2 天以前 6ecf7171775a04bbcb52c9943bcafce699c837a7

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserSite.java

@@ -24,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_user_site")
@ApiModel(value="TUserSite对象", description="")
public class TUserSite extends BasePojo {
public class TUserSite {

    private static final long serialVersionUID = 1L;