Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TCoursePackagePayment.java

@@ -164,7 +164,8 @@
     */
    @TableField("salesName")
    private String salesName;

    @TableField("giftClassHours")
    private Integer giftClassHours;

    private String studentName;
    private String province;
@@ -173,4 +174,6 @@
    private Integer hasHours;
    private BigDecimal laveCashPayment;
    private BigDecimal cashPayment1;
    // 所选课时规格id
    private Integer coursePackageConfigId;
}