Merge branch 'dev' into test

This commit is contained in:
chenbowen
2026-01-29 08:54:13 +08:00

View File

@@ -13,7 +13,6 @@ import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi;
import com.zt.plat.module.bpm.api.task.BpmTaskApi;
import com.zt.plat.module.bpm.api.task.dto.BpmApprovalDetailReqDTO;
import com.zt.plat.module.infra.api.businessfile.BusinessFileApi;
import com.zt.plat.module.infra.api.file.FileApi;
import com.zt.plat.module.system.api.dept.DeptApi;
@@ -135,9 +134,6 @@ public class DemoContractController extends AbstractFileUploadController impleme
@GetMapping("/page")
@Operation(summary = "获得合同分页")
public CommonResult<PageResult<DemoContractRespVO>> getDemoContractPage(@Valid DemoContractPageReqVO pageReqVO) {
CommonResult<FileRespDTO> file = fileApi.getFile(1968928810422521857L);
BpmApprovalDetailReqDTO reqDTO = new BpmApprovalDetailReqDTO();
Long id = IdWorker.getId();
System.out.println("Generated ID: " + id);
PageResult<DemoContractDO> pageResult = demoContractService.getDemoContractPage(pageReqVO);