Merge remote-tracking branch 'origin/master'

nickchange

2023-11-27 0e382ffab8b3abba1d620187312cca90c81bae25

Merge remote-tracking branch 'origin/master'

 cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml

@@ -56,7 +56,7 @@
        pg.NAME AS className,
        pg.`type` AS classType
        FROM
        t_course_package_payment py
        t_course_package_order_student py
        LEFT JOIN t_course_package pg ON py.coursePackageId = pg.id

        <where>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html

@@ -1156,7 +1156,8 @@
                  },
                  "id": "u:fcd7f36c5f88",
                  "level": "link",
                  "disabledOn": "this.laveClassHours === 0 || this.classType===2"
                  "disabledOn": "this.laveClassHours === 0 || this.classType===2",
                    "hiddenOn": "this.classType===2"
                },
                {
                  "type": "button",
@@ -1357,7 +1358,8 @@
                  },
                  "id": "u:ae1e6e73beb9",
                  "level": "link",
                  "disabledOn": "this.laveClassHours === 0 || this.classType===2"
                  "disabledOn": "this.laveClassHours === 0 || this.classType===2",
                    "hiddenOn": "this.classType===2"
                },
                {
                  "type": "button",
@@ -1604,7 +1606,8 @@
                  },
                  "id": "u:dd3110deaf9d",
                  "level": "link",
                  "disabledOn": "this.classType===2"
                  "disabledOn": "this.classType===2",
                    "hiddenOn": "this.classType===2"
                }
              ]
            }