Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

This commit is contained in:
pserimal
2023-06-19 12:03:01 +08:00
16 changed files with 98 additions and 50 deletions

View File

@@ -3,6 +3,7 @@ package com.cool.store.controller;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.HyPartnerClerkService;
import com.cool.store.vo.PartnerClerkVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +22,7 @@ import java.util.List;
*/
@RestController
@Slf4j
@Api(tags = "店员")
public class ClerkController {
@Resource

View File

@@ -7,6 +7,7 @@ import com.cool.store.service.ZoneService;
import com.cool.store.vo.ZoneCheckVO;
import com.cool.store.vo.ZoneVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -23,6 +24,7 @@ import java.util.List;
*/
@RestController
@Slf4j
@Api(tags = "战区")
public class ZoneController {
@Resource