Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/GradeServiceImpl.java

@@ -140,6 +140,7 @@ public class GradeServiceImpl implements GradeService{
                            detail.setGrade_id(grade_id);
                            detail.setClazz_status(1);
                            detail.setClazz_grade(grade.getGrade_name());
+                           detail.setSchool_id(schoolId);
                            detail.setClazz_nickname(grade.getGrade_name() + detail.getClazz_name());
                            clazzes.add(detail);
                         }

frontend/pc-web/app/view/basic/student/StudentDetail.js

@@ -143,7 +143,7 @@ Ext.define('school.view.basic.student.StudentDetail', {
             }, {
                 xtype: 'textfield',
                 name: 'stu_cardNo',
-                fieldLabel: '校园卡通号',
+                fieldLabel: '校园通卡号',
             }, {
                 name: "parent",
                 xtype: "detailGridField",

frontend/pc-web/app/view/basic/student/StudentList.js

@@ -184,7 +184,7 @@ Ext.define('school.view.basic.student.StudentList', {
                     xtype: 'datecolumn',
                     format: 'Y-m-d'
                 }, {
-                    text: '校园卡通号',
+                    text: '校园通卡号',
                     dataIndex: 'stu_cardNo'
                 }]
             },