Merge remote-tracking branch 'origin/master'

yaowanxin

2 天以前 e83d4cecece6e8677392229e996dea22bbe2d1e9

 src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java

@@ -134,14 +134,14 @@
     * 查询采购台账列表
     */
    @GetMapping("/listPage")
    public IPage<PurchaseLedger> listPage(Page page, PurchaseLedger purchaseLedger) {
         return purchaseLedgerService.selectPurchaseLedgerListPage(page ,purchaseLedger);
    public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
         return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page ,purchaseLedger));
    }

    @ApiOperation("生成采购序列号")
    @GetMapping("/createPurchaseNo")
    @Log(title = "生成采购序列号", businessType = BusinessType.OTHER)
    public String createPurchaseNo() {
        return purchaseLedgerService.getPurchaseNo();
    public AjaxResult createPurchaseNo() {
        return AjaxResult.success("生成成功",purchaseLedgerService.getPurchaseNo());
    }
}