Merge branch 'fix-上线前修改' into develop

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -56,7 +56,7 @@ namespace MySystem
                                     if(!string.IsNullOrEmpty(Mer.MerIdcardNo))
                                     {
                                         string startNo = Mer.MerIdcardNo.Substring(0, 6);
-                                        string endNo = Mer.MerIdcardNo.Substring(Mer.MerIdcardNo.Length - 4, 4);
+                                        string endNo = Mer.MerIdcardNo.Substring(Mer.MerIdcardNo.Length - 4, 4).ToUpper();
                                         string Name = Mer.MerName;
                                         if (Mer.ProductType == "2")
                                         {
@@ -114,7 +114,7 @@ namespace MySystem
                                 add.MgrName = Mer.AgentName;
                                 add.MerStatus = 1;
                                 add.KqSnNo = Mer.SnNo;
-                                add.MerIdcardNo = Mer.MerIdcardNo;
+                                add.MerIdcardNo = Mer.MerIdcardNo.ToUpper();
                                 add.MerRealName = Mer.MerRealName;
                                 add.MerchantMobile = Mer.MerMobile;
                                 add.MerchantName = Mer.MerName;

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -206,7 +206,7 @@ namespace MySystem
                                             {
                                                 if(string.IsNullOrEmpty(merchant.MerIdcardNo) && !string.IsNullOrEmpty(trade.Field2))
                                                 {
-                                                    merchant.MerIdcardNo = trade.Field2; //商户身份证号
+                                                    merchant.MerIdcardNo = trade.Field2.ToUpper(); //商户身份证号
                                                 }
                                                 if(!string.IsNullOrEmpty(trade.Field1))
                                                 {