Merge branch 'feature-dgy-二期功能' into feature-dgy-后台测试

Util/Main1/MerchantInfoUtil.cs

@@ -150,7 +150,7 @@ namespace MySystem.Service.Main1
         {
             var info = "";
             List<RelationData> relationData = new List<RelationData>();
-            var merInfo = MerchantInfoService.List(relationData, " and UpdateDate>='" + StartDate + " 00:00:00' and UpdateDate<='" + EndDate + " 23:59:59'", 1, 9999999);
+            var merInfo = MerchantDepositOrderService.List(relationData, " and Status>0 and UpdateDate>='" + StartDate + " 00:00:00' and UpdateDate<='" + EndDate + " 23:59:59'", 1, 9999999);
             if (merInfo.Count > 0)
             {
                 var merIds = "";

Util/Main2/MerchantInfoUtil.cs

@@ -149,7 +149,7 @@ namespace MySystem.Service.Main2
         {
             var info = "";
             List<RelationData> relationData = new List<RelationData>();
-            var merInfo = MerchantInfoService.List(relationData, " and UpdateDate>='" + StartDate + " 00:00:00' and UpdateDate<='" + EndDate + " 23:59:59'", 1, 9999999);
+            var merInfo = MerchantDepositOrderService.List(relationData, " and Status>0 and UpdateDate>='" + StartDate + " 00:00:00' and UpdateDate<='" + EndDate + " 23:59:59'", 1, 9999999);
             if (merInfo.Count > 0)
             {
                 var merIds = "";