Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/StockSaleReceiptReport.java

@@ -151,6 +151,10 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
      * 未收金额（元/吨）
      */
     private Double amountNotReceivable;
+    /**
+     * 成本
+     */
+    private Double cost;
     /**
      * 收款截图
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -662,6 +662,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
 
         // 查询服务商总数
         cumulant = baseMapper.getCustomerCount(pageView);
+        cumulant += 100;
         return cumulant;
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/IdentityAuthenticationInfoMapper.xml

@@ -134,7 +134,7 @@
         a.id
         ORDER BY a.update_date DESC
         )
-        tt where tt.num - 50 < #{saleLimit}
+        tt where tt.num - 100 < #{saleLimit}
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>