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

xuhy

6 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

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

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

    private static final long serialVersionUID = 1L;