springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
@@ -64,7 +64,6 @@ @ApiModelProperty("营业状态") private Integer businessStatus; @ApiModelProperty("商家绑定账户") private String account; springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -764,7 +764,7 @@ } @ApiOperation(value = "便民服务商家入驻") @PostMapping("/jinhuiMerchant/addData") @PostMapping("/merchant/addData") public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item) { item.setAuditType("1"); @@ -772,7 +772,7 @@ } @ApiOperation(value = "便民服务商家编辑") @PostMapping("/jinhuiMerchant/editData") @PostMapping("/merchant/editData") public R merchantEditData(@RequestBody JinhuiConvenientMerchantVO item) { return jinhuiCommunityService.merchantEditData(item); @@ -780,7 +780,7 @@ @ApiOperation(value = "便民服务商家审核") @GetMapping("/jinhuiMerchant/audit") @GetMapping("/merchant/audit") public R merchantAudit(@RequestParam("auditType") String auditType, @RequestParam("merchantId") String merchantId, @RequestParam(value = "auditOpinion", required = false) String auditOpinion) springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java
@@ -42,7 +42,7 @@ * @param item * @return */ IPage<JinhuiConvenientMerchantVO> pageMerchant(@Param("page") Page page, IPage<JinhuiConvenientMerchant> pageMerchant(@Param("page") Page page, @Param("item") JinhuiPageConvenientMerchantDTO item); /** springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java
@@ -44,7 +44,7 @@ Page page = new Page<>(); page.setSize(pageConvenientMerchantDTO.getPageSize()); page.setCurrent(pageConvenientMerchantDTO.getPageNum()); IPage<JinhuiConvenientMerchantVO> iPage = this.baseMapper.pageMerchant(page, pageConvenientMerchantDTO); IPage<JinhuiConvenientMerchant> iPage = this.baseMapper.pageMerchant(page, pageConvenientMerchantDTO); return R.ok(iPage); }