Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!1031

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -114,6 +114,7 @@ public class CouponMgrController extends BaseApiController {
             .like(null != coupon && StringUtils.isNotBlank(coupon.getTitle()), Coupon::getTitle, coupon.getTitle());
         queryWrapper.lambda().eq(null != coupon && null != coupon.getStatus(), Coupon::getStatus, coupon.getStatus());
         queryWrapper.lambda().eq(null != coupon && null != coupon.getType(), Coupon::getType, coupon.getType());
+        queryWrapper.lambda().eq(null != coupon && null != coupon.getIsNewUserCoupon(), Coupon::getIsNewUserCoupon, coupon.getIsNewUserCoupon());
         queryWrapper.lambda()
             .notIn(null != coupon && !CollectionUtils.isEmpty(coupon.getExcludeCouponIds()), Coupon::getCouponId,
                 coupon.getExcludeCouponIds());

mp-service/src/main/java/com/qs/mp/channel/domain/Channel.java

@@ -229,6 +229,10 @@ public class Channel implements Serializable {
   @ApiModelProperty("状态,启用.停用")
   private ChannelStatusEnum status;
 
+  @TableField("comm_flag")
+  @ApiModelProperty("分佣标识:0默认,1不分佣")
+  private Integer commFlag;
+
   /**
    * 创建时间
    */