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/business/service/impl/ScoreServiceImpl.java

@@ -288,7 +288,7 @@ public class ScoreServiceImpl implements ScoreService{
             msg.setKeyword3(main.getSi_examtitle());
             msg.setKeyword4(DateUtils.format(main.getSi_examdate(),"yyyy-MM-dd"));
             msg.setKeyword5(school.getSchool_name());
-            msg.setRemark(noticer.getSubject()+ "成绩为:" + new BigDecimal(noticer.getScore()).toPlainString());
+            msg.setRemark(noticer.getSubject()+ "成绩为:" + new BigDecimal(noticer.getScore()).setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString());
             msg.setTemplateId(template.getSt_templateid());
             msg.setTouser(noticer.getOpenid());
             msg.setAppId(school.getSchool_appid());

applications/school/school-server/src/main/resources/config/application-docker-prod.yml

@@ -14,7 +14,4 @@ spring:
     password: select123***
   redis:
     host: 10.10.100.173
-    port: 6379
-smartschool:
-  domain:
-    wechat: https://school-wechat.ubtob.com
+    port: 6379

base-servers/gateway-server/src/main/resources/application.yml

@@ -145,7 +145,9 @@ auth:
     - /api/school/wxSchool/notify/getNotify*
     - /api/school/wxSchool/stuScore/getScoreByStu*
     - /api/school/wxSchool/taskNotify/taskDetail*
-    - /api/school/wxSchool/outInRecord/inout/detail*
+    - /api/school/wxSchool/outInRecord/inout/detail/*
+    - /api/school/wxSchool/vote/voteDetailTeacher*
+    - /api/school/wxSchool/oaLeave/lvDetail**
     - /api/device/**
     - /api/file/download*
     - /api/school/excel/**

frontend/wechat-web/src/modules/album/PictureList.jsx

@@ -122,11 +122,11 @@ export default class PictureList extends Component {
                     this.setState({
                         description: getStrValue(dataObject, 'albumRemarks')
                     })
-                    console.log('dataObject.albumTitle',dataObject.albumTitle)
-                    if(dataObject.albumTitle != null &&
+                    // console.log('dataObject.albumTitle',dataObject.albumTitle)
+                    if (dataObject.albumTitle != null &&
                         dataObject.albumTitle != '' &&
-                        dataObject.albumTitle.length > 0){
-                        document.title(dataObject.albumTitle)
+                        dataObject.albumTitle.length > 0) {
+                        document.title = dataObject.albumTitle
                     }
                     const pictures = dataObject.clazzPictureDOS
                     if (pictures) {
@@ -152,12 +152,13 @@ export default class PictureList extends Component {
                     }
                 }
             }
-
             this.setState({pictureList})
         }).catch(error => {
             Toast.hide()
             if (typeof error === 'string') {
                 Toast.fail(error)
+            } else {
+                Toast.fail("请求异常")
             }
         })
     }