From 0e382ffab8b3abba1d620187312cca90c81bae25 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 27 十一月 2023 12:02:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml | 2 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
index 8cd79c2..b16898d 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
+++ b/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>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
index 7861601..50ef837 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
+++ b/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"
}
]
}
--
Gitblit v1.7.1