Merge branch 'feature-dgy-广电卡交易' into feature-dgy-后台测试

AppStart/Helper/SIMPosMerchantTradeService.cs

@@ -309,7 +309,7 @@ namespace MySystem
                                         {
                                             spdb.TradeRecord.Add(new SpModels.TradeRecord()
                                             {
-                                                CreateDate = DateTime.Now.AddMonths(-1), //创建时间
+                                                CreateDate = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-20 HH:mm:ss")), //创建时间
                                                 TradeSerialNo = OrderNo, //订单编号
                                                 AgentNo = WorkName + WorkNo, //一级服务商编号
                                                 MerNo = Mobile, //商户编

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -658,7 +658,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     spdb.TradeRecord.Add(new SpModels.TradeRecord()
                     {
-                        CreateDate = DateTime.Now.AddMonths(-1), //创建时间
+                        CreateDate = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-20 HH:mm:ss")), //创建时间
                         TradeSerialNo = OrderNo, //订单编号
                         AgentNo = WorkName + WorkNo, //一级服务商编号
                         MerNo = Mobile, //商户编