merge: 合并 feature/p132_74-risk-engine 最新改动到 glms/feature/1.4.2
合并风控引擎分支最新提交(风控超时校验SQL、标的/合约类型传参、 UnderlyingAssetClass 字段、缓存刷新与异步逻辑优化等),无冲突。
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using BaseOUDAL;
|
||||
using BaseOUDAL;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using YLErp.Enums;
|
||||
|
||||
@@ -33,6 +33,7 @@ namespace YLErp.Model
|
||||
this.AvailableForClient = obj.AvailableForClient;
|
||||
this.Remark = obj.Remark;
|
||||
this.TrialSource = obj.TrialSource;
|
||||
this.OldRiskTrialStatus = obj.OldRiskTrialStatus;
|
||||
this.OptId = obj.OptId;
|
||||
this.OptName = obj.OptName;
|
||||
this.OptDate = obj.OptDate;
|
||||
|
||||
Reference in New Issue
Block a user