update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupPaymentCalenderAuditDto.java

@@ -75,6 +75,25 @@ public class MusicGroupPaymentCalenderAuditDto {
     @ApiModelProperty(value = "缴费截止日期",required = false)
     private String deadlinePaymentDate;
 
+    @ApiModelProperty(value = "是否赠送网管课",required = false)
+    private Boolean isGiveMusicNetwork;
+
+    public Boolean getIsGiveMusicNetwork() {
+        return isGiveMusicNetwork;
+    }
+
+    public void setIsGiveMusicNetwork(Boolean giveMusicNetwork) {
+        isGiveMusicNetwork = giveMusicNetwork;
+    }
+
+    public Boolean getGiveMusicNetwork() {
+        return isGiveMusicNetwork;
+    }
+
+    public void setGiveMusicNetwork(Boolean giveMusicNetwork) {
+        isGiveMusicNetwork = giveMusicNetwork;
+    }
+
     public BigDecimal getPaymentAmount() {
         return paymentAmount;
     }

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -399,6 +399,7 @@
         <result property="deadlinePaymentDate" column="deadline_payment_date_"/>
         <result property="auditMemo" column="audit_memo_"/>
         <result property="paymentAmount" column="payment_amount_"/>
+        <result property="isGiveMusicNetwork" column="is_give_music_network_"/>
     </resultMap>
     <sql id="MusicGroupPaymentCalenderAuditDtoSql">
         <where>
@@ -451,7 +452,7 @@
         mgpc.pay_user_type_,mgpc.memo_,mgpc.status_,SUM(mgpccs.course_total_minuties_) course_total_minuties_,
         SUM(mgpccs.course_original_price_) course_original_price_,SUM(mgpccs.course_current_price_) course_current_price_,
         MAX(mg.name_) music_group_name_,MAX(mg.organ_id_) organ_id_,MAX(mgpccs.name_) calender_settings_name_,mgpc.payment_pattern_,mgpc.payment_valid_start_date_,
-        mgpc.payment_valid_end_date_,mgpc.start_payment_date_,mgpc.deadline_payment_date_,mgpc.audit_memo_,mgpc.payment_amount_
+        mgpc.payment_valid_end_date_,mgpc.start_payment_date_,mgpc.deadline_payment_date_,mgpc.audit_memo_,mgpc.payment_amount_,mgpc.is_give_music_network_
         FROM music_group_payment_calender mgpc
         LEFT JOIN music_group mg ON mg.id_ = mgpc.music_group_id_
         LEFT JOIN music_group_payment_calender_course_settings mgpccs ON mgpc.id_ = mgpccs.music_group_payment_calender_id_