From f834ff9a7a61acfe9e09574a592e863e70e895ef Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 26 九月 2023 22:51:54 +0800
Subject: [PATCH] 9.26。10
---
.idea/workspace.xml | 20 ++++++++++++++------
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js | 2 +-
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 77a138c..5e24ef4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,10 +22,9 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。8">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。9">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/feignclient/account/AppUserClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/feignclient/account/AppUserClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -288,7 +287,7 @@
<workItem from="1695633789585" duration="4703000" />
<workItem from="1695638521906" duration="1415000" />
<workItem from="1695689815334" duration="13353000" />
- <workItem from="1695718856285" duration="17226000" />
+ <workItem from="1695718856285" duration="20809000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -509,7 +508,15 @@
<option name="project" value="LOCAL" />
<updated>1695735796008</updated>
</task>
- <option name="localTasksCounter" value="30" />
+ <task id="LOCAL-00030" summary="9.26。9">
+ <option name="closed" value="true" />
+ <created>1695736281231</created>
+ <option name="number" value="00030" />
+ <option name="presentableId" value="LOCAL-00030" />
+ <option name="project" value="LOCAL" />
+ <updated>1695736281231</updated>
+ </task>
+ <option name="localTasksCounter" value="31" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -543,7 +550,8 @@
<MESSAGE value="9.26。6" />
<MESSAGE value="9.26。7" />
<MESSAGE value="9.26。8" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26。8" />
+ <MESSAGE value="9.26。9" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。9" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js
index c1d1b38..16a688e 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js
@@ -31,7 +31,7 @@
},
{title: '到课状态', field: 'signInOrNot', align: 'center', valign: 'middle',
formatter: function (v, row) {
- if (row.reservationStatus === 0) {
+ if (row.signInOrNot === 2) {
return '请假';
} else {
switch (v) {
--
Gitblit v1.7.1