Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-09-12 3d357cce580997b5c4c293000d26c2823207eaea

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

# Conflicts:
#	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java

@@ -28,7 +28,7 @@
public interface OtherClient {

    //单位分页
    @PostMapping(value = "/t-invoice-type/t-company/unit/page")
    @PostMapping(value = "/t-company/unit/page")
    R<Page<TCompany>> queryUnitPage(@RequestBody UnitListQueryDto unitListQueryDto);
    //单位添加修改
    @PostMapping(value = "/t-company/unit/addOrUpdate")

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java

@@ -23,9 +23,9 @@
    private Integer pageSize = 10;

    public Integer getPageCurr() {
        if(null != pageCurr){
            pageCurr = (pageCurr - 1) * pageSize;
        }
//        if(null != pageCurr){
//            pageCurr = (pageCurr - 1) * pageSize;
//        }
        return pageCurr;
    }