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

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

@@ -137,6 +137,7 @@ auth:
     - /api/account/account/register
     - /api/school/wxSchool/user/bindOpenid*
     - /api/school/wxSchool/user/isBinding*
+    - /api/school/wxSchool/user/userLogin*
     - /api/school/wxSchool/user/sendCodeUpdate*
     - /api/school/wxSchool/meeting/getMeetingDetails*
     - /api/school/wxSchool/notify/getNotify*

frontend/pc-web/app/view/Interaction/notice/SchoolNotice.js

@@ -72,7 +72,8 @@ Ext.define('school.view.interaction.notice.SchoolNotice', {
                 fieldLabel: "内容",
                 height: 300,
                 columnWidth: 1,
-                allowBlank: false
+                allowBlank: false,
+                maxLength: 5000
             }, {
                 xtype: 'mfilefield',
                 name: 'notify_files',