3.3.0 fix

distributed-print/install/nginx/teachcloud.conf

@@ -2,14 +2,14 @@ server {
         listen 7400;
         charset utf-8;
 
-        # 知学知考
+        # ֪ѧ֪¿¼
         location ^~ / {
 			root  ../../teachcloud/web/print/;
 			index  index.html index.htm;
 			try_files $uri $uri/ /index.html;
 		}
 
-		# 阅�端
+		# Ôľí¶Ë
         location /mark/ {
             alias  ../../teachcloud/web/mark/;
             index  index.html index.htm;

teachcloud-common/src/main/resources/mapper/BasicStudentMapper.xml

@@ -123,7 +123,7 @@
             student_code AS studentCode,
             phone_number AS phoneNumber,
             bc.id AS collegeId,
-            bc.college_name AS collegeName,
+            bc.name AS collegeName,
             bm.id AS majorId,
             bm.name AS majorName,
             clazz_id AS clazzId,
@@ -138,7 +138,7 @@
                 LEFT JOIN
             basic_major bm ON stu.major_id = bm.id AND bm.enable = TRUE
                 LEFT JOIN
-            basic_college bc ON stu.belong_org_id = bc.id
+            sys_org bc ON stu.belong_org_id = bc.id
         <where>
             and stu.enable = true
             <if test="schoolId != null and schoolId != ''">
@@ -169,7 +169,7 @@
         student_code AS studentCode,
         phone_number AS phoneNumber,
         bc.id AS collegeId,
-        bc.college_name AS collegeName,
+        bc.name AS collegeName,
         bm.id AS majorId,
         bm.name AS majorName,
         clazz_id AS clazzId,
@@ -185,7 +185,7 @@
         LEFT JOIN
         basic_major bm ON stu.major_id = bm.id AND bm.enable = TRUE
         LEFT JOIN
-        basic_college bc ON stu.belong_org_id = bc.id
+        sys_org bc ON stu.belong_org_id = bc.id
         <where>
             and stu.enable = true
             <if test="queryParams != null and queryParams != ''">