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

applications/school/school-server/src/main/resources/mapper/ScoreMapper.xml

@@ -329,7 +329,7 @@
         #{sd_stu,jdbcType=VARCHAR},
       </if>
       <if test="sd_score != null" >
-        #{sd_score,jdbcType=INTEGER},
+        #{sd_score,jdbcType=DOUBLE},
       </if>
       <if test="sd_subject != null" >
         #{sd_subject,jdbcType=VARCHAR},

frontend/pc-web/app/view/Interaction/score/Detail.js

@@ -27,7 +27,8 @@ Ext.define('school.view.interaction.score.Detail', {
             }, {
                 xtype: 'textfield',
                 name: 'si_examtitle',
-                fieldLabel: '考试标题'
+                fieldLabel: '考试标题',
+                allowBlank: false
             }, {
                 xtype: 'datefield',
                 name: 'si_examdate',

frontend/pc-web/app/view/Interaction/score/List.js

@@ -162,6 +162,7 @@ Ext.define('school.view.interaction.score.List', {
                     dataIndex: 'si_examtitle',
                     width: 200
                 }, {
+                    xtype: 'datecolumn',
                     text: '考试时间',
                     dataIndex: 'si_examdate',
                     width: 150,