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

Pu Zhibing

2 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Banner.java

@@ -57,7 +57,7 @@
    @TableField("target_type")
    private Integer targetType;
    /**
     * 链接类型1.跳转地址，2=跳转小程序
     * 链接类型1.手动输入/跳转地址  2.选择已有/跳转小程序
     */
    @TableField("link_type")
    private Integer linkType;