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

soss-system/src/main/java/com/soss/system/domain/po/BannerPo.java

@@ -29,6 +29,10 @@ public class BannerPo {
      * 排序
      */
     private Integer sort;
+    /**
+     * 状态
+     */
+    private Integer state;
 
     @ApiModelProperty("可用省份列表，全国通用传 [0]")
     private String[] province;

soss-system/src/main/java/com/soss/system/service/impl/SysBannerServiceImpl.java

@@ -111,6 +111,7 @@ public class SysBannerServiceImpl implements ISysBannerService {
         banner.setType(bannerPo.getType());
         banner.setTarget(bannerPo.getTarget());
         banner.setSort(bannerPo.getSort());
+        banner.setState(bannerPo.getState());
         if (bannerPo.getProvince() != null && bannerPo.getProvince().length > 0) {
             banner.setProvince(Arrays.asList(bannerPo.getProvince()).stream().collect(Collectors.joining(",")));
         }