Merge branch '西昌缴费二期' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌缴费二期

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuBalance/Index.js

@@ -131,6 +131,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-info\">自动分配扣减</span>';
                             } else if (cellvalue === 6) {
                                 return '<span class=\"label label-warning\">自动分配增加</span>';
+                            } else if (cellvalue === 7) {
+                                return '<span class=\"label label-warning\">导入POS收款</span>';
                             }
                         }
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/UtilityController.cs

@@ -95,7 +95,11 @@ namespace Learun.Application.Web.Controllers
                 case "listfile":
                     return ListFileManager(UeditorConfig.GetString("fileManagerListPath"), UeditorConfig.GetStringList("fileManagerAllowFiles"));
                 case "catchimage":
-                    return CrawlerHandler();
+                    //return CrawlerHandler();存在漏洞
+                    return Content(new
+                    {
+                        state = "action 参数为空或者 action 不被支持。"
+                    }.ToJson());
                 default:
                     return Content(new
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuBalance/FinaChargeStuBalanceEntity.cs

@@ -85,7 +85,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         [Column("CHANGEDATE")]
         public DateTime? ChangeDate { get; set; }
         /// <summary>
-        /// 变动原因（1二维码缴费，2导入贷款，3导入现金，4退费，5自动分配扣减，6自动分配增加）
+        /// 变动原因（1二维码缴费，2导入贷款，3导入现金，4退费，5自动分配扣减，6自动分配增加，7导入POS收款）
         /// </summary>
         [Column("CHANGETYPE")]
         public int? ChangeType { get; set; }