Merge remote-tracking branch 'origin/master'

nickchange

2023-11-16 b87922420561a35c1e99b67fb6caf3fe30bc8ccf

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java

@@ -234,6 +234,7 @@
            model.addAttribute("reasons", "");
        }
        model.addAttribute("coursePackagePaymentConfig", JSON.toJSONString(list));
        model.addAttribute("type2",tCoursePackage.getType());

        return PREFIX1 + "coursePackageDiscount.html";
    }