Merge remote-tracking branch 'origin/master'

alien-entity/src/main/java/shop/alien/entity/store/LifeGroupBuyMain.java

@@ -45,6 +45,10 @@ public class LifeGroupBuyMain {
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "审批评论")
+    @TableField("approval_comments")
+    private String approvalComments;
+
     /**
      * 商铺id
      */

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeGroupBuyThaliVo.java

@@ -44,6 +44,10 @@ public class LifeGroupBuyThaliVo {
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "审批评论")
+    @TableField("approval_comments")
+    private String approvalComments;
+
     /**
      * 商铺id
      */

alien-entity/src/main/java/shop/alien/mapper/LifeGroupBuyMainMapper.java

@@ -20,7 +20,7 @@ import shop.alien.entity.store.vo.LifeGroupBuyThaliVo;
 @Mapper
 public interface LifeGroupBuyMainMapper extends BaseMapper<LifeGroupBuyMain> {
 
-    @Select("select id,group_no,group_type,status,store_id,image_id,group_name,start_time_type,\n" +
+    @Select("select id,group_no,group_type,status,approval_comments,store_id,image_id,group_name,start_time_type,\n" +
             "        start_time_value,end_time,inventory_num,quota_type,quota_value,\n" +
             "        original_price,preferential_price,effective_date_type,effective_date_value,disable_date_type,\n" +
             "        disable_date_value,write_off,reservation_rules,use_rules,applicable_num,\n" +