diff --git a/admin/tests/unit/.eslintrc.js b/admin/tests/unit/.eslintrc.js
deleted file mode 100644
index 958d51ba..00000000
--- a/admin/tests/unit/.eslintrc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  env: {
-    jest: true
-  }
-}
diff --git a/admin/tests/unit/components/Hamburger.spec.js b/admin/tests/unit/components/Hamburger.spec.js
deleted file mode 100644
index 01ea303a..00000000
--- a/admin/tests/unit/components/Hamburger.spec.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { shallowMount } from '@vue/test-utils'
-import Hamburger from '@/components/Hamburger/index.vue'
-describe('Hamburger.vue', () => {
-  it('toggle click', () => {
-    const wrapper = shallowMount(Hamburger)
-    const mockFn = jest.fn()
-    wrapper.vm.$on('toggleClick', mockFn)
-    wrapper.find('.hamburger').trigger('click')
-    expect(mockFn).toBeCalled()
-  })
-  it('prop isActive', () => {
-    const wrapper = shallowMount(Hamburger)
-    wrapper.setProps({ isActive: true })
-    expect(wrapper.contains('.is-active')).toBe(true)
-    wrapper.setProps({ isActive: false })
-    expect(wrapper.contains('.is-active')).toBe(false)
-  })
-})
diff --git a/admin/tests/unit/components/SvgIcon.spec.js b/admin/tests/unit/components/SvgIcon.spec.js
deleted file mode 100644
index 31467a9f..00000000
--- a/admin/tests/unit/components/SvgIcon.spec.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { shallowMount } from '@vue/test-utils'
-import SvgIcon from '@/components/SvgIcon/index.vue'
-describe('SvgIcon.vue', () => {
-  it('iconClass', () => {
-    const wrapper = shallowMount(SvgIcon, {
-      propsData: {
-        iconClass: 'test'
-      }
-    })
-    expect(wrapper.find('use').attributes().href).toBe('#icon-test')
-  })
-  it('className', () => {
-    const wrapper = shallowMount(SvgIcon, {
-      propsData: {
-        iconClass: 'test'
-      }
-    })
-    expect(wrapper.classes().length).toBe(1)
-    wrapper.setProps({ className: 'test' })
-    expect(wrapper.classes().includes('test')).toBe(true)
-  })
-})
diff --git a/admin/tests/unit/utils/formatTime.spec.js b/admin/tests/unit/utils/formatTime.spec.js
deleted file mode 100644
index d07e414f..00000000
--- a/admin/tests/unit/utils/formatTime.spec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { formatTime } from '@/utils/index.js'
-describe('Utils:formatTime', () => {
-  const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01"
-  const retrofit = 5 * 1000
-
-  it('ten digits timestamp', () => {
-    expect(formatTime((d / 1000).toFixed(0))).toBe('7月13日17时54分')
-  })
-  it('test now', () => {
-    expect(formatTime(+new Date() - 1)).toBe('刚刚')
-  })
-  it('less two minute', () => {
-    expect(formatTime(+new Date() - 60 * 2 * 1000 + retrofit)).toBe('2分钟前')
-  })
-  it('less two hour', () => {
-    expect(formatTime(+new Date() - 60 * 60 * 2 * 1000 + retrofit)).toBe('2小时前')
-  })
-  it('less one day', () => {
-    expect(formatTime(+new Date() - 60 * 60 * 24 * 1 * 1000)).toBe('1天前')
-  })
-  it('more than one day', () => {
-    expect(formatTime(d)).toBe('7月13日17时54分')
-  })
-  it('format', () => {
-    expect(formatTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54')
-    expect(formatTime(d, '{y}-{m}-{d}')).toBe('2018-07-13')
-    expect(formatTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54')
-  })
-})
diff --git a/admin/tests/unit/utils/parseTime.spec.js b/admin/tests/unit/utils/parseTime.spec.js
deleted file mode 100644
index bc61d1ac..00000000
--- a/admin/tests/unit/utils/parseTime.spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { parseTime } from '@/utils/index.js'
-describe('Utils:parseTime', () => {
-  const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01"
-  it('timestamp', () => {
-    expect(parseTime(d)).toBe('2018-07-13 17:54:01')
-  })
-
-  it('timestamp string', () => {
-    expect(parseTime((d + ''))).toBe('2018-07-13 17:54:01')
-  })
-
-  it('ten digits timestamp', () => {
-    expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01')
-  })
-  it('new Date', () => {
-    expect(parseTime(new Date(d))).toBe('2018-07-13 17:54:01')
-  })
-  it('format', () => {
-    expect(parseTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54')
-    expect(parseTime(d, '{y}-{m}-{d}')).toBe('2018-07-13')
-    expect(parseTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54')
-  })
-  it('get the day of the week', () => {
-    expect(parseTime(d, '{a}')).toBe('五') // 星期五
-  })
-  it('get the day of the week', () => {
-    expect(parseTime(+d + 1000 * 60 * 60 * 24 * 2, '{a}')).toBe('日') // 星期日
-  })
-  it('empty argument', () => {
-    expect(parseTime()).toBeNull()
-  })
-})
diff --git a/admin/tests/unit/utils/validate.spec.js b/admin/tests/unit/utils/validate.spec.js
deleted file mode 100644
index ef2efe61..00000000
--- a/admin/tests/unit/utils/validate.spec.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { validUsername, validURL, validLowerCase, validUpperCase, validAlphabets } from '@/utils/validate.js'
-describe('Utils:validate', () => {
-  it('validUsername', () => {
-    expect(validUsername('admin')).toBe(true)
-    expect(validUsername('editor')).toBe(true)
-    expect(validUsername('xxxx')).toBe(false)
-  })
-  it('validURL', () => {
-    expect(validURL('https://github.com/PanJiaChen/vue-element-admin')).toBe(true)
-    expect(validURL('http://github.com/PanJiaChen/vue-element-admin')).toBe(true)
-    expect(validURL('github.com/PanJiaChen/vue-element-admin')).toBe(false)
-  })
-  it('validLowerCase', () => {
-    expect(validLowerCase('abc')).toBe(true)
-    expect(validLowerCase('Abc')).toBe(false)
-    expect(validLowerCase('123abc')).toBe(false)
-  })
-  it('validUpperCase', () => {
-    expect(validUpperCase('ABC')).toBe(true)
-    expect(validUpperCase('Abc')).toBe(false)
-    expect(validUpperCase('123ABC')).toBe(false)
-  })
-  it('validAlphabets', () => {
-    expect(validAlphabets('ABC')).toBe(true)
-    expect(validAlphabets('Abc')).toBe(true)
-    expect(validAlphabets('123aBC')).toBe(false)
-  })
-})
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreServiceController.java b/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreServiceController.java
deleted file mode 100644
index 6af25c32..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreServiceController.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.zbkj.crmeb.front.controller;
-
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreService;
-import com.zbkj.crmeb.store.model.StoreServiceLog;
-import com.zbkj.crmeb.store.request.StoreServiceLogSearchRequest;
-import com.zbkj.crmeb.store.service.StoreServiceLogService;
-import com.zbkj.crmeb.store.service.StoreServiceService;
-import com.zbkj.crmeb.user.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 用户 -- 用户中心
- */
-@Slf4j
-@RestController("StoreServiceController")
-@RequestMapping("api/front/user/service")
-@Api(tags = "客服")
-public class StoreServiceController {
-    @Autowired
-    private StoreServiceService storeServiceService;
-
-    @Autowired
-    private UserService userService;
-
-    @Autowired
-    private StoreServiceLogService storeServiceLogService;
-
-    /**
-     * 客服列表
-     * @author Mr.Zhang
-     * @since 2020-06-10
-     */
-    @ApiOperation(value = "客服列表")
-    @RequestMapping(value = "/lst", method = RequestMethod.GET)
-    public CommonResult<List<StoreService>> getList(){
-        return CommonResult.success(storeServiceService.getList(new PageParamRequest()));
-    }
-
-    /**
-     * 聊天记录
-     * @author Mr.Zhang
-     * @since 2020-06-10
-     */
-    @ApiOperation(value = "聊天记录")
-    @RequestMapping(value = "/record/{toUid}", method = RequestMethod.GET)
-    @ApiImplicitParam(name = "toUid", value = "聊天人编号", dataType = "intteger")
-    public CommonResult<CommonPage<StoreServiceLog>> getList(@PathVariable Integer toUid, @Validated PageParamRequest pageParamRequest){
-        StoreServiceLogSearchRequest request = new StoreServiceLogSearchRequest();
-        request.setUid(userService.getUserIdException());
-        request.setToUid(toUid);
-        return CommonResult.success(CommonPage.restPage(storeServiceLogService.getList(request, pageParamRequest)));
-    }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreBargainController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreBargainController.java
deleted file mode 100644
index f73253bc..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreBargainController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.request.StoreBargainRequest;
-import com.zbkj.crmeb.store.request.StoreBargainSearchRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.store.service.StoreBargainService;
-import com.zbkj.crmeb.store.model.StoreBargain;
-
-
-/**
- * 砍价表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/bargain")
-//@Api(tags = "商品 -- 砍价") //配合swagger使用
-
-public class StoreBargainController {
-
-    @Autowired
-    private StoreBargainService storeBargainService;
-
-    /**
-     * 分页显示砍价表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreBargain>>  getList(@Validated StoreBargainSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreBargain> storeBargainCommonPage = CommonPage.restPage(storeBargainService.getList(request, pageParamRequest));
-        return CommonResult.success(storeBargainCommonPage);
-    }
-
-    /**
-     * 新增砍价表
-     * @param storeBargainRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreBargainRequest storeBargainRequest){
-        StoreBargain storeBargain = new StoreBargain();
-        BeanUtils.copyProperties(storeBargainRequest, storeBargain);
-
-        if(storeBargainService.save(storeBargain)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除砍价表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeBargainService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改砍价表
-     * @param id integer id
-     * @param storeBargainRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreBargainRequest storeBargainRequest){
-        StoreBargain storeBargain = new StoreBargain();
-        BeanUtils.copyProperties(storeBargainRequest, storeBargain);
-        storeBargain.setId(id);
-
-        if(storeBargainService.updateById(storeBargain)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询砍价表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreBargain> info(@RequestParam(value = "id") Integer id){
-        StoreBargain storeBargain = storeBargainService.getById(id);
-        return CommonResult.success(storeBargain);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreBargainUserController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreBargainUserController.java
deleted file mode 100644
index 6b38a779..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreBargainUserController.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.request.StoreBargainUserRequest;
-import com.zbkj.crmeb.store.request.StoreBargainUserSearchRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.store.service.StoreBargainUserService;
-import com.zbkj.crmeb.store.model.StoreBargainUser;
-
-
-/**
- * 用户参与砍价表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/bargain/user")
-//@Api(tags = "商品 -- 砍价 -- 用户参与") //配合swagger使用
-
-public class StoreBargainUserController {
-
-    @Autowired
-    private StoreBargainUserService storeBargainUserService;
-
-    /**
-     * 分页显示用户参与砍价表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreBargainUser>>  getList(
-            @Validated StoreBargainUserSearchRequest request,
-            @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreBargainUser> storeBargainUserCommonPage =
-                CommonPage.restPage(storeBargainUserService.getList(request, pageParamRequest));
-        return CommonResult.success(storeBargainUserCommonPage);
-    }
-
-    /**
-     * 新增用户参与砍价表
-     * @param storeBargainUserRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreBargainUserRequest storeBargainUserRequest){
-        StoreBargainUser storeBargainUser = new StoreBargainUser();
-        BeanUtils.copyProperties(storeBargainUserRequest, storeBargainUser);
-
-        if(storeBargainUserService.save(storeBargainUser)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除用户参与砍价表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeBargainUserService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改用户参与砍价表
-     * @param id integer id
-     * @param storeBargainUserRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreBargainUserRequest storeBargainUserRequest){
-        StoreBargainUser storeBargainUser = new StoreBargainUser();
-        BeanUtils.copyProperties(storeBargainUserRequest, storeBargainUser);
-        storeBargainUser.setId(id);
-
-        if(storeBargainUserService.updateById(storeBargainUser)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询用户参与砍价表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreBargainUser> info(@RequestParam(value = "id") Integer id){
-        StoreBargainUser storeBargainUser = storeBargainUserService.getById(id);
-        return CommonResult.success(storeBargainUser);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreBargainUserHelpController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreBargainUserHelpController.java
deleted file mode 100644
index f795d166..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreBargainUserHelpController.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.request.StoreBargainUserHelpRequest;
-import com.zbkj.crmeb.store.request.StoreBargainUserHelpSearchRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.store.service.StoreBargainUserHelpService;
-import com.zbkj.crmeb.store.model.StoreBargainUserHelp;
-
-
-/**
- * 砍价用户帮助表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/bargain/user/help")
-//@Api(tags = "商品 -- 砍价 --用户帮助") //配合swagger使用
-
-public class StoreBargainUserHelpController {
-
-    @Autowired
-    private StoreBargainUserHelpService storeBargainUserHelpService;
-
-    /**
-     * 分页显示砍价用户帮助表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreBargainUserHelp>>  getList(
-            @Validated StoreBargainUserHelpSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreBargainUserHelp> storeBargainUserHelpCommonPage = CommonPage.restPage(storeBargainUserHelpService.getList(request, pageParamRequest));
-        return CommonResult.success(storeBargainUserHelpCommonPage);
-    }
-
-    /**
-     * 新增砍价用户帮助表
-     * @param storeBargainUserHelpRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreBargainUserHelpRequest storeBargainUserHelpRequest){
-        StoreBargainUserHelp storeBargainUserHelp = new StoreBargainUserHelp();
-        BeanUtils.copyProperties(storeBargainUserHelpRequest, storeBargainUserHelp);
-
-        if(storeBargainUserHelpService.save(storeBargainUserHelp)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除砍价用户帮助表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeBargainUserHelpService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改砍价用户帮助表
-     * @param id integer id
-     * @param storeBargainUserHelpRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreBargainUserHelpRequest storeBargainUserHelpRequest){
-        StoreBargainUserHelp storeBargainUserHelp = new StoreBargainUserHelp();
-        BeanUtils.copyProperties(storeBargainUserHelpRequest, storeBargainUserHelp);
-        storeBargainUserHelp.setId(id);
-
-        if(storeBargainUserHelpService.updateById(storeBargainUserHelp)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询砍价用户帮助表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreBargainUserHelp> info(@RequestParam(value = "id") Integer id){
-        StoreBargainUserHelp storeBargainUserHelp = storeBargainUserHelpService.getById(id);
-        return CommonResult.success(storeBargainUserHelp);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreCategoryController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreCategoryController.java
deleted file mode 100644
index b2b46bc3..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreCategoryController.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.request.StoreCategoryRequest;
-import com.zbkj.crmeb.store.request.StoreCategorySearchRequest;
-import com.zbkj.crmeb.store.response.StoreCategoryTreeList;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.store.service.StoreCategoryService;
-import com.zbkj.crmeb.store.model.StoreCategory;
-
-import java.util.List;
-
-
-/**
- * 商品分类表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/category")
-//@Api(tags = "商品 -- 分类") //配合swagger使用
-// 注意：商品分类使用无限极分类完成
-public class StoreCategoryController {
-
-    @Autowired
-    private StoreCategoryService storeCategoryService;
-
-    /**
-     * 分页显示商品分类表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreCategory>>  getList(
-            @Validated StoreCategorySearchRequest request,
-            @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreCategory> storeCategoryCommonPage =
-                CommonPage.restPage(storeCategoryService.getList(request, pageParamRequest));
-        return CommonResult.success(storeCategoryCommonPage);
-    }
-
-//    @ApiOperation(value = "树形结构体")
-//    @RequestMapping(value = "/list/tree", method = RequestMethod.GET)
-//    public CommonResult<StoreCategoryTreeList> getTreeData(
-//            @Validated Integer pid,
-//            @Validated Integer isShow){
-//        List<StoreCategoryTreeList> list = storeCategoryService.getTreeList(pid, isShow);
-//        return null;
-//    }
-
-    /**
-     * 新增商品分类表
-     * @param storeCategoryRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreCategoryRequest storeCategoryRequest){
-        StoreCategory storeCategory = new StoreCategory();
-        BeanUtils.copyProperties(storeCategoryRequest, storeCategory);
-
-        if(storeCategoryService.save(storeCategory)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除商品分类表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeCategoryService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改商品分类表
-     * @param id integer id
-     * @param storeCategoryRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreCategoryRequest storeCategoryRequest){
-        StoreCategory storeCategory = new StoreCategory();
-        BeanUtils.copyProperties(storeCategoryRequest, storeCategory);
-        storeCategory.setId(id);
-
-        if(storeCategoryService.updateById(storeCategory)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询商品分类表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreCategory> info(@RequestParam(value = "id") Integer id){
-        StoreCategory storeCategory = storeCategoryService.getById(id);
-        return CommonResult.success(storeCategory);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreCombinationController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreCombinationController.java
deleted file mode 100644
index 94c0c080..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreCombinationController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.request.StoreCombinationRequest;
-import com.zbkj.crmeb.store.request.StoreCombinationSearchRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.store.service.StoreCombinationService;
-import com.zbkj.crmeb.store.model.StoreCombination;
-
-
-/**
- * 拼团商品表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/combination")
-//@Api(tags = "商品 -- 拼团") //配合swagger使用
-
-public class StoreCombinationController {
-
-    @Autowired
-    private StoreCombinationService storeCombinationService;
-
-    /**
-     * 分页显示拼团商品表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreCombination>>  getList(
-            @Validated StoreCombinationSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreCombination> storeCombinationCommonPage =
-                CommonPage.restPage(storeCombinationService.getList(request, pageParamRequest));
-        return CommonResult.success(storeCombinationCommonPage);
-    }
-
-    /**
-     * 新增拼团商品表
-     * @param storeCombinationRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreCombinationRequest storeCombinationRequest){
-        StoreCombination storeCombination = new StoreCombination();
-        BeanUtils.copyProperties(storeCombinationRequest, storeCombination);
-
-        if(storeCombinationService.save(storeCombination)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除拼团商品表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeCombinationService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改拼团商品表
-     * @param id integer id
-     * @param storeCombinationRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreCombinationRequest storeCombinationRequest){
-        StoreCombination storeCombination = new StoreCombination();
-        BeanUtils.copyProperties(storeCombinationRequest, storeCombination);
-        storeCombination.setId(id);
-
-        if(storeCombinationService.updateById(storeCombination)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询拼团商品表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreCombination> info(@RequestParam(value = "id") Integer id){
-        StoreCombination storeCombination = storeCombinationService.getById(id);
-        return CommonResult.success(storeCombination);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StorePinkController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StorePinkController.java
deleted file mode 100644
index 2521c715..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StorePinkController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.request.StorePinkRequest;
-import com.zbkj.crmeb.store.request.StorePinkSearchRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.store.service.StorePinkService;
-import com.zbkj.crmeb.store.model.StorePink;
-
-
-/**
- * 拼团表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/pink")
-//@Api(tags = "拼团") //配合swagger使用
-
-public class StorePinkController {
-
-    @Autowired
-    private StorePinkService storePinkService;
-
-    /**
-     * 分页显示拼团表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StorePink>>  getList(
-            @Validated StorePinkSearchRequest request,
-            @Validated PageParamRequest pageParamRequest){
-        CommonPage<StorePink> storePinkCommonPage = CommonPage.restPage(storePinkService.getList(request, pageParamRequest));
-        return CommonResult.success(storePinkCommonPage);
-    }
-
-    /**
-     * 新增拼团表
-     * @param storePinkRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StorePinkRequest storePinkRequest){
-        StorePink storePink = new StorePink();
-        BeanUtils.copyProperties(storePinkRequest, storePink);
-
-        if(storePinkService.save(storePink)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除拼团表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storePinkService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改拼团表
-     * @param id integer id
-     * @param storePinkRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StorePinkRequest storePinkRequest){
-        StorePink storePink = new StorePink();
-        BeanUtils.copyProperties(storePinkRequest, storePink);
-        storePink.setId(id);
-
-        if(storePinkService.updateById(storePink)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询拼团表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-28
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StorePink> info(@RequestParam(value = "id") Integer id){
-        StorePink storePink = storePinkService.getById(id);
-        return CommonResult.success(storePink);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductAttrController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductAttrController.java
deleted file mode 100644
index 1b5da9bc..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductAttrController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreProductAttr;
-import com.zbkj.crmeb.store.request.StoreProductAttrRequest;
-import com.zbkj.crmeb.store.request.StoreProductAttrSearchRequest;
-import com.zbkj.crmeb.store.service.StoreProductAttrService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * 商品属性表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/product/attr")
-//@Api(tags = "商品 -- 属性") //配合swagger使用
-
-public class StoreProductAttrController {
-
-    @Autowired
-    private StoreProductAttrService storeProductAttrService;
-
-    /**
-     * 分页显示商品属性表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreProductAttr>>  getList(@Validated StoreProductAttrSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreProductAttr> storeProductAttrCommonPage = CommonPage.restPage(storeProductAttrService.getList(request, pageParamRequest));
-        return CommonResult.success(storeProductAttrCommonPage);
-    }
-
-    /**
-     * 新增商品属性表
-     * @param storeProductAttrRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreProductAttrRequest storeProductAttrRequest){
-        StoreProductAttr storeProductAttr = new StoreProductAttr();
-        BeanUtils.copyProperties(storeProductAttrRequest, storeProductAttr);
-
-        if(storeProductAttrService.save(storeProductAttr)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除商品属性表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeProductAttrService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改商品属性表
-     * @param id integer id
-     * @param storeProductAttrRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreProductAttrRequest storeProductAttrRequest){
-        StoreProductAttr storeProductAttr = new StoreProductAttr();
-        BeanUtils.copyProperties(storeProductAttrRequest, storeProductAttr);
-//        storeProductAttr.setId(id);
-
-        if(storeProductAttrService.updateById(storeProductAttr)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询商品属性表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreProductAttr> info(@RequestParam(value = "id") Integer id){
-        StoreProductAttr storeProductAttr = storeProductAttrService.getById(id);
-        return CommonResult.success(storeProductAttr);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductAttrResultController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductAttrResultController.java
deleted file mode 100644
index 8045153c..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductAttrResultController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreProductAttrResult;
-import com.zbkj.crmeb.store.request.StoreProductAttrResultRequest;
-import com.zbkj.crmeb.store.request.StoreProductAttrResultSearchRequest;
-import com.zbkj.crmeb.store.service.StoreProductAttrResultService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * 商品属性详情表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/product/attr/result")
-//@Api(tags = "商品 -- 属性 -- 详情") //配合swagger使用
-
-public class StoreProductAttrResultController {
-
-    @Autowired
-    private StoreProductAttrResultService storeProductAttrResultService;
-
-    /**
-     * 分页显示商品属性详情表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreProductAttrResult>>  getList(@Validated StoreProductAttrResultSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreProductAttrResult> storeProductAttrResultCommonPage = CommonPage.restPage(storeProductAttrResultService.getList(request, pageParamRequest));
-        return CommonResult.success(storeProductAttrResultCommonPage);
-    }
-
-    /**
-     * 新增商品属性详情表
-     * @param storeProductAttrResultRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreProductAttrResultRequest storeProductAttrResultRequest){
-        StoreProductAttrResult storeProductAttrResult = new StoreProductAttrResult();
-        BeanUtils.copyProperties(storeProductAttrResultRequest, storeProductAttrResult);
-
-        if(storeProductAttrResultService.save(storeProductAttrResult)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除商品属性详情表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeProductAttrResultService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改商品属性详情表
-     * @param id integer id
-     * @param storeProductAttrResultRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreProductAttrResultRequest storeProductAttrResultRequest){
-        StoreProductAttrResult storeProductAttrResult = new StoreProductAttrResult();
-        BeanUtils.copyProperties(storeProductAttrResultRequest, storeProductAttrResult);
-//        storeProductAttrResult.setId(id);
-
-        if(storeProductAttrResultService.updateById(storeProductAttrResult)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询商品属性详情表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreProductAttrResult> info(@RequestParam(value = "id") Integer id){
-        StoreProductAttrResult storeProductAttrResult = storeProductAttrResultService.getById(id);
-        return CommonResult.success(storeProductAttrResult);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductAttrValueController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductAttrValueController.java
deleted file mode 100644
index eec262e0..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductAttrValueController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreProductAttrValue;
-import com.zbkj.crmeb.store.request.StoreProductAttrValueRequest;
-import com.zbkj.crmeb.store.request.StoreProductAttrValueSearchRequest;
-import com.zbkj.crmeb.store.service.StoreProductAttrValueService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * 商品属性值表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/product/attr/value")
-//@Api(tags = "商品 -- 属性值") //配合swagger使用
-
-public class StoreProductAttrValueController {
-
-    @Autowired
-    private StoreProductAttrValueService storeProductAttrValueService;
-
-    /**
-     * 分页显示商品属性值表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreProductAttrValue>>  getList(@Validated StoreProductAttrValueSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreProductAttrValue> storeProductAttrValueCommonPage = CommonPage.restPage(storeProductAttrValueService.getList(request, pageParamRequest));
-        return CommonResult.success(storeProductAttrValueCommonPage);
-    }
-
-    /**
-     * 新增商品属性值表
-     * @param storeProductAttrValueRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreProductAttrValueRequest storeProductAttrValueRequest){
-        StoreProductAttrValue storeProductAttrValue = new StoreProductAttrValue();
-        BeanUtils.copyProperties(storeProductAttrValueRequest, storeProductAttrValue);
-
-        if(storeProductAttrValueService.save(storeProductAttrValue)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除商品属性值表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeProductAttrValueService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改商品属性值表
-     * @param id integer id
-     * @param storeProductAttrValueRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreProductAttrValueRequest storeProductAttrValueRequest){
-        StoreProductAttrValue storeProductAttrValue = new StoreProductAttrValue();
-        BeanUtils.copyProperties(storeProductAttrValueRequest, storeProductAttrValue);
-//        storeProductAttrValue.setId(id);
-
-        if(storeProductAttrValueService.updateById(storeProductAttrValue)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询商品属性值表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreProductAttrValue> info(@RequestParam(value = "id") Integer id){
-        StoreProductAttrValue storeProductAttrValue = storeProductAttrValueService.getById(id);
-        return CommonResult.success(storeProductAttrValue);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductCateController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductCateController.java
deleted file mode 100644
index 8d316596..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductCateController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreProductCate;
-import com.zbkj.crmeb.store.request.StoreProductCateRequest;
-import com.zbkj.crmeb.store.request.StoreProductCateSearchRequest;
-import com.zbkj.crmeb.store.service.StoreProductCateService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * 商品分类辅助表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/product/cate")
-//@Api(tags = "商品 -- 分类辅助") //配合swagger使用
-
-public class StoreProductCateController {
-
-    @Autowired
-    private StoreProductCateService storeProductCateService;
-
-    /**
-     * 分页显示商品分类辅助表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreProductCate>>  getList(@Validated StoreProductCateSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreProductCate> storeProductCateCommonPage = CommonPage.restPage(storeProductCateService.getList(request, pageParamRequest));
-        return CommonResult.success(storeProductCateCommonPage);
-    }
-
-    /**
-     * 新增商品分类辅助表
-     * @param storeProductCateRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreProductCateRequest storeProductCateRequest){
-        StoreProductCate storeProductCate = new StoreProductCate();
-        BeanUtils.copyProperties(storeProductCateRequest, storeProductCate);
-
-        if(storeProductCateService.save(storeProductCate)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除商品分类辅助表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeProductCateService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改商品分类辅助表
-     * @param id integer id
-     * @param storeProductCateRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreProductCateRequest storeProductCateRequest){
-        StoreProductCate storeProductCate = new StoreProductCate();
-        BeanUtils.copyProperties(storeProductCateRequest, storeProductCate);
-        storeProductCate.setId(id);
-
-        if(storeProductCateService.updateById(storeProductCate)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询商品分类辅助表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreProductCate> info(@RequestParam(value = "id") Integer id){
-        StoreProductCate storeProductCate = storeProductCateService.getById(id);
-        return CommonResult.success(storeProductCate);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductCouponController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductCouponController.java
deleted file mode 100644
index 8cf53aa1..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductCouponController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreProductCoupon;
-import com.zbkj.crmeb.store.request.StoreProductCouponRequest;
-import com.zbkj.crmeb.store.request.StoreProductCouponSearchRequest;
-import com.zbkj.crmeb.store.service.StoreProductCouponService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- *  前端控制器
- */
-@Slf4j
-@RestController
-//@RequestMapping("api/admin/store-product-coupon")
-@Api(tags = "") //配合swagger使用
-
-public class StoreProductCouponController {
-
-    @Autowired
-    private StoreProductCouponService storeProductCouponService;
-
-    /**
-     * 分页显示
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-08-07
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreProductCoupon>>  getList(@Validated StoreProductCouponSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreProductCoupon> storeProductCouponCommonPage = CommonPage.restPage(storeProductCouponService.getList(request, pageParamRequest));
-        return CommonResult.success(storeProductCouponCommonPage);
-    }
-
-    /**
-     * 新增
-     * @param storeProductCouponRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-08-07
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreProductCouponRequest storeProductCouponRequest){
-        StoreProductCoupon storeProductCoupon = new StoreProductCoupon();
-        BeanUtils.copyProperties(storeProductCouponRequest, storeProductCoupon);
-
-        if(storeProductCouponService.save(storeProductCoupon)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-08-07
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeProductCouponService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改
-     * @param id integer id
-     * @param storeProductCouponRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-08-07
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreProductCouponRequest storeProductCouponRequest){
-        StoreProductCoupon storeProductCoupon = new StoreProductCoupon();
-        BeanUtils.copyProperties(storeProductCouponRequest, storeProductCoupon);
-        storeProductCoupon.setId(id);
-
-        if(storeProductCouponService.updateById(storeProductCoupon)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-08-07
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreProductCoupon> info(@RequestParam(value = "id") Integer id){
-        StoreProductCoupon storeProductCoupon = storeProductCouponService.getById(id);
-        return CommonResult.success(storeProductCoupon);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductDescriptionController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductDescriptionController.java
deleted file mode 100644
index 1e190ce1..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductDescriptionController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreProductDescription;
-import com.zbkj.crmeb.store.request.StoreProductDescriptionRequest;
-import com.zbkj.crmeb.store.request.StoreProductDescriptionSearchRequest;
-import com.zbkj.crmeb.store.service.StoreProductDescriptionService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- *  前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/product/description")
-//@Api(tags = "商品 -- 描述") //配合swagger使用
-
-public class StoreProductDescriptionController {
-
-    @Autowired
-    private StoreProductDescriptionService storeProductDescriptionService;
-
-    /**
-     * 分页显示
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreProductDescription>>  getList(@Validated StoreProductDescriptionSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreProductDescription> storeProductDescriptionCommonPage = CommonPage.restPage(storeProductDescriptionService.getList(request, pageParamRequest));
-        return CommonResult.success(storeProductDescriptionCommonPage);
-    }
-
-    /**
-     * 新增
-     * @param storeProductDescriptionRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreProductDescriptionRequest storeProductDescriptionRequest){
-        StoreProductDescription storeProductDescription = new StoreProductDescription();
-        BeanUtils.copyProperties(storeProductDescriptionRequest, storeProductDescription);
-
-        if(storeProductDescriptionService.save(storeProductDescription)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeProductDescriptionService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改
-     * @param id integer id
-     * @param storeProductDescriptionRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreProductDescriptionRequest storeProductDescriptionRequest){
-        StoreProductDescription storeProductDescription = new StoreProductDescription();
-        BeanUtils.copyProperties(storeProductDescriptionRequest, storeProductDescription);
-//        storeProductDescription.setId(id);
-
-        if(storeProductDescriptionService.updateById(storeProductDescription)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreProductDescription> info(@RequestParam(value = "id") Integer id){
-        StoreProductDescription storeProductDescription = storeProductDescriptionService.getById(id);
-        return CommonResult.success(storeProductDescription);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductRelationController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductRelationController.java
deleted file mode 100644
index d03c533e..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductRelationController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreProduct;
-import com.zbkj.crmeb.store.model.StoreProductRelation;
-import com.zbkj.crmeb.store.request.StoreProductRelationRequest;
-import com.zbkj.crmeb.store.request.StoreProductRelationSearchRequest;
-import com.zbkj.crmeb.store.service.StoreProductRelationService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * 商品点赞和收藏表 前端控制器
- */
-//@Slf4j
-//@RestController
-//@RequestMapping("api/admin/store/product/relation")
-//@Api(tags = "商品 -- 点赞 -- 收藏") //配合swagger使用
-
-public class StoreProductRelationController {
-
-    @Autowired
-    private StoreProductRelationService storeProductRelationService;
-
-    /**
-     * 分页显示商品点赞和收藏表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreProduct>>  getList(
-            @Validated StoreProductRelationSearchRequest request,
-            @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreProduct> storeProductRelationCommonPage
-                = CommonPage.restPage(storeProductRelationService.getList(request, pageParamRequest));
-        return CommonResult.success(storeProductRelationCommonPage);
-    }
-
-    /**
-     * 新增商品点赞和收藏表
-     * @param storeProductRelationRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated StoreProductRelationRequest storeProductRelationRequest){
-        StoreProductRelation storeProductRelation = new StoreProductRelation();
-        BeanUtils.copyProperties(storeProductRelationRequest, storeProductRelation);
-
-        if(storeProductRelationService.save(storeProductRelation)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除商品点赞和收藏表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeProductRelationService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改商品点赞和收藏表
-     * @param id integer id
-     * @param storeProductRelationRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated StoreProductRelationRequest storeProductRelationRequest){
-        StoreProductRelation storeProductRelation = new StoreProductRelation();
-        BeanUtils.copyProperties(storeProductRelationRequest, storeProductRelation);
-//        storeProductRelation.setId(id);
-
-        if(storeProductRelationService.updateById(storeProductRelation)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询商品点赞和收藏表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-05-27
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreProductRelation> info(@RequestParam(value = "id") Integer id){
-        StoreProductRelation storeProductRelation = storeProductRelationService.getById(id);
-        return CommonResult.success(storeProductRelation);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreServiceController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreServiceController.java
deleted file mode 100644
index 8ccc66fe..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreServiceController.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.request.StoreServiceRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.store.service.StoreServiceService;
-import com.zbkj.crmeb.store.model.StoreService;
-
-
-/**
- * 客服表 前端控制器
- */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/store-service")
-@Api(tags = "客服表") //配合swagger使用
-
-public class StoreServiceController {
-
-    @Autowired
-    private StoreServiceService storeServiceService;
-
-    /**
-     * 分页显示客服表
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-06-10
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreService>>  getList(@Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreService> storeServiceCommonPage = CommonPage.restPage(storeServiceService.getList(pageParamRequest));
-        return CommonResult.success(storeServiceCommonPage);
-    }
-
-    /**
-     * 新增客服表
-     * @param storeServiceRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-06-10
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@RequestBody @Validated StoreServiceRequest storeServiceRequest){
-        StoreService storeService = new StoreService();
-        BeanUtils.copyProperties(storeServiceRequest, storeService);
-
-        if(storeServiceService.save(storeService)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除客服表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-06-10
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.GET)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(storeServiceService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改客服表
-     * @param id integer id
-     * @param storeServiceRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-06-10
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @RequestBody @Validated StoreServiceRequest storeServiceRequest){
-        StoreService storeService = new StoreService();
-        BeanUtils.copyProperties(storeServiceRequest, storeService);
-        storeService.setId(id);
-
-        if(storeServiceService.updateById(storeService)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询客服表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-06-10
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<StoreService> info(@RequestParam(value = "id") Integer id){
-        StoreService storeService = storeServiceService.getById(id);
-        return CommonResult.success(storeService);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreServiceLogController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreServiceLogController.java
deleted file mode 100644
index dedc3916..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreServiceLogController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.zbkj.crmeb.store.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.request.StoreServiceLogSearchRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.store.service.StoreServiceLogService;
-import com.zbkj.crmeb.store.model.StoreServiceLog;
-
-
-/**
- * 客服用户对话记录表 前端控制器
- */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/store-service-log")
-@Api(tags = "客服用户对话记录表") //配合swagger使用
-
-public class StoreServiceLogController {
-
-    @Autowired
-    private StoreServiceLogService storeServiceLogService;
-
-    /**
-     * 分页显示客服用户对话记录表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-06-10
-     */
-    @ApiOperation(value = "分页列表") //配合swagger使用
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<StoreServiceLog>>  getList(@Validated StoreServiceLogSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<StoreServiceLog> storeServiceLogCommonPage = CommonPage.restPage(storeServiceLogService.getList(request, pageParamRequest));
-        return CommonResult.success(storeServiceLogCommonPage);
-    }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreBargainDao.java b/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreBargainDao.java
deleted file mode 100644
index 1d5f7ff0..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreBargainDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.store.dao;
-
-import com.zbkj.crmeb.store.model.StoreBargain;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 砍价表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-public interface StoreBargainDao extends BaseMapper<StoreBargain> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreBargainUserDao.java b/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreBargainUserDao.java
deleted file mode 100644
index 8e869dac..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreBargainUserDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.store.dao;
-
-import com.zbkj.crmeb.store.model.StoreBargainUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 用户参与砍价表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-public interface StoreBargainUserDao extends BaseMapper<StoreBargainUser> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreBargainUserHelpDao.java b/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreBargainUserHelpDao.java
deleted file mode 100644
index c4e1e656..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreBargainUserHelpDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.store.dao;
-
-import com.zbkj.crmeb.store.model.StoreBargainUserHelp;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 砍价用户帮助表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-public interface StoreBargainUserHelpDao extends BaseMapper<StoreBargainUserHelp> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreCategoryDao.java b/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreCategoryDao.java
deleted file mode 100644
index 0ce68f64..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreCategoryDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.store.dao;
-
-import com.zbkj.crmeb.store.model.StoreCategory;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 商品分类表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-public interface StoreCategoryDao extends BaseMapper<StoreCategory> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreCombinationDao.java b/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreCombinationDao.java
deleted file mode 100644
index 48067f2c..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreCombinationDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.store.dao;
-
-import com.zbkj.crmeb.store.model.StoreCombination;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 拼团商品表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-public interface StoreCombinationDao extends BaseMapper<StoreCombination> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StorePinkDao.java b/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StorePinkDao.java
deleted file mode 100644
index d51540d6..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StorePinkDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.store.dao;
-
-import com.zbkj.crmeb.store.model.StorePink;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 拼团表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-public interface StorePinkDao extends BaseMapper<StorePink> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreServiceDao.java b/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreServiceDao.java
deleted file mode 100644
index 0b93d96a..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreServiceDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.store.dao;
-
-import com.zbkj.crmeb.store.model.StoreService;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 客服表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-06-10
- */
-public interface StoreServiceDao extends BaseMapper<StoreService> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreServiceLogDao.java b/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreServiceLogDao.java
deleted file mode 100644
index be178de0..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/dao/StoreServiceLogDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.store.dao;
-
-import com.zbkj.crmeb.store.model.StoreServiceLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 客服用户对话记录表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-06-10
- */
-public interface StoreServiceLogDao extends BaseMapper<StoreServiceLog> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreBargain.java b/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreBargain.java
deleted file mode 100644
index a9ece77a..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreBargain.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.zbkj.crmeb.store.model;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 砍价表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_bargain")
-@ApiModel(value="StoreBargain对象", description="砍价表")
-public class StoreBargain implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "砍价商品ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "关联商品ID")
-    private Integer productId;
-
-    @ApiModelProperty(value = "砍价活动名称")
-    private String title;
-
-    @ApiModelProperty(value = "砍价活动图片")
-    private String image;
-
-    @ApiModelProperty(value = "单位名称")
-    private String unitName;
-
-    @ApiModelProperty(value = "库存")
-    private Integer stock;
-
-    @ApiModelProperty(value = "销量")
-    private Integer sales;
-
-    @ApiModelProperty(value = "砍价商品轮播图")
-    private String images;
-
-    @ApiModelProperty(value = "砍价开启时间")
-    private Integer startTime;
-
-    @ApiModelProperty(value = "砍价结束时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "砍价商品名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "砍价金额")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "砍价商品最低价")
-    private BigDecimal minPrice;
-
-    @ApiModelProperty(value = "每次购买的砍价商品数量")
-    private Integer num;
-
-    @ApiModelProperty(value = "用户每次砍价的最大金额")
-    private BigDecimal bargainMaxPrice;
-
-    @ApiModelProperty(value = "用户每次砍价的最小金额")
-    private BigDecimal bargainMinPrice;
-
-    @ApiModelProperty(value = "用户每次砍价的次数")
-    private Integer bargainNum;
-
-    @ApiModelProperty(value = "砍价状态 0(到砍价时间不自动开启)  1(到砍价时间自动开启时间)")
-    private Boolean status;
-
-    @ApiModelProperty(value = "反多少积分")
-    private BigDecimal giveIntegral;
-
-    @ApiModelProperty(value = "砍价活动简介")
-    private String info;
-
-    @ApiModelProperty(value = "成本价")
-    private BigDecimal cost;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "是否推荐0不推荐1推荐")
-    private Boolean isHot;
-
-    @ApiModelProperty(value = "是否删除 0未删除 1删除")
-    private Boolean isDel;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-
-    @ApiModelProperty(value = "是否包邮 0不包邮 1包邮")
-    private Boolean isPostage;
-
-    @ApiModelProperty(value = "邮费")
-    private BigDecimal postage;
-
-    @ApiModelProperty(value = "砍价规则")
-    private String rule;
-
-    @ApiModelProperty(value = "砍价商品浏览量")
-    private Integer look;
-
-    @ApiModelProperty(value = "砍价商品分享量")
-    private Integer share;
-
-    @ApiModelProperty(value = "运费模板ID")
-    private Integer tempId;
-
-    @ApiModelProperty(value = "重量")
-    private BigDecimal weight;
-
-    @ApiModelProperty(value = "体积")
-    private BigDecimal volume;
-
-    @ApiModelProperty(value = "限购总数")
-    private Integer quota;
-
-    @ApiModelProperty(value = "限量总数显示")
-    private Integer quotaShow;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreBargainUser.java b/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreBargainUser.java
deleted file mode 100644
index 61f885a6..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreBargainUser.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zbkj.crmeb.store.model;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 用户参与砍价表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_bargain_user")
-@ApiModel(value="StoreBargainUser对象", description="用户参与砍价表")
-public class StoreBargainUser implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "用户参与砍价表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer uid;
-
-    @ApiModelProperty(value = "砍价商品id")
-    private Integer bargainId;
-
-    @ApiModelProperty(value = "砍价的最低价")
-    private BigDecimal bargainPriceMin;
-
-    @ApiModelProperty(value = "砍价金额")
-    private BigDecimal bargainPrice;
-
-    @ApiModelProperty(value = "砍掉的价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "状态 1参与中 2 活动结束参与失败 3活动结束参与成功")
-    private Boolean status;
-
-    @ApiModelProperty(value = "参与时间")
-    private Integer addTime;
-
-    @ApiModelProperty(value = "是否取消")
-    private Boolean isDel;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreBargainUserHelp.java b/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreBargainUserHelp.java
deleted file mode 100644
index 3f436d8f..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreBargainUserHelp.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.zbkj.crmeb.store.model;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 砍价用户帮助表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_bargain_user_help")
-@ApiModel(value="StoreBargainUserHelp对象", description="砍价用户帮助表")
-public class StoreBargainUserHelp implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "砍价用户帮助表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "帮助的用户id")
-    private Integer uid;
-
-    @ApiModelProperty(value = "砍价商品ID")
-    private Integer bargainId;
-
-    @ApiModelProperty(value = "用户参与砍价表id")
-    private Integer bargainUserId;
-
-    @ApiModelProperty(value = "帮助砍价多少金额")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreCategory.java b/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreCategory.java
deleted file mode 100644
index fa70a0e0..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreCategory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.zbkj.crmeb.store.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 商品分类表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_category")
-@ApiModel(value="StoreCategory对象", description="商品分类表")
-public class StoreCategory implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "商品分类表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "父id")
-    private Integer pid;
-
-    @ApiModelProperty(value = "分类名称")
-    private String cateName;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "图标")
-    private String pic;
-
-    @ApiModelProperty(value = "是否推荐")
-    private Boolean isShow;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreCombination.java b/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreCombination.java
deleted file mode 100644
index c0514180..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreCombination.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.zbkj.crmeb.store.model;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 拼团商品表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_combination")
-@ApiModel(value="StoreCombination对象", description="拼团商品表")
-public class StoreCombination implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "商品id")
-    private Integer productId;
-
-    @ApiModelProperty(value = "商户id")
-    private Integer merId;
-
-    @ApiModelProperty(value = "推荐图")
-    private String image;
-
-    @ApiModelProperty(value = "轮播图")
-    private String images;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "活动属性")
-    private String attr;
-
-    @ApiModelProperty(value = "参团人数")
-    private Integer people;
-
-    @ApiModelProperty(value = "简介")
-    private String info;
-
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "销量")
-    private Integer sales;
-
-    @ApiModelProperty(value = "库存")
-    private Integer stock;
-
-    @ApiModelProperty(value = "添加时间")
-    private String addTime;
-
-    @ApiModelProperty(value = "推荐")
-    private Boolean isHost;
-
-    @ApiModelProperty(value = "商品状态")
-    private Boolean isShow;
-
-    private Boolean isDel;
-
-    private Boolean combination;
-
-    @ApiModelProperty(value = "商户是否可用1可用0不可用")
-    private Boolean merUse;
-
-    @ApiModelProperty(value = "是否包邮1是0否")
-    private Boolean isPostage;
-
-    @ApiModelProperty(value = "邮费")
-    private BigDecimal postage;
-
-    @ApiModelProperty(value = "拼团开始时间")
-    private Integer startTime;
-
-    @ApiModelProperty(value = "拼团结束时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "拼团订单有效时间")
-    private Integer effectiveTime;
-
-    @ApiModelProperty(value = "拼图商品成本")
-    private Integer cost;
-
-    @ApiModelProperty(value = "浏览量")
-    private Integer browse;
-
-    @ApiModelProperty(value = "单位名")
-    private String unitName;
-
-    @ApiModelProperty(value = "运费模板ID")
-    private Integer tempId;
-
-    @ApiModelProperty(value = "重量")
-    private BigDecimal weight;
-
-    @ApiModelProperty(value = "体积")
-    private BigDecimal volume;
-
-    @ApiModelProperty(value = "单次购买数量")
-    private Integer num;
-
-    @ApiModelProperty(value = "限购总数")
-    private Integer quota;
-
-    @ApiModelProperty(value = "限量总数显示")
-    private Integer quotaShow;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StorePink.java b/crmeb/src/main/java/com/zbkj/crmeb/store/model/StorePink.java
deleted file mode 100644
index 28fba629..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StorePink.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.zbkj.crmeb.store.model;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 拼团表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_pink")
-@ApiModel(value="StorePink对象", description="拼团表")
-public class StorePink implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户id")
-    private Integer uid;
-
-    @ApiModelProperty(value = "订单id 生成")
-    private String orderId;
-
-    @ApiModelProperty(value = "订单id  数据库")
-    private Integer orderIdKey;
-
-    @ApiModelProperty(value = "购买商品个数")
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "购买总金额")
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "拼团商品id")
-    private Integer cid;
-
-    @ApiModelProperty(value = "商品id")
-    private Integer pid;
-
-    @ApiModelProperty(value = "拼图总人数")
-    private Integer people;
-
-    @ApiModelProperty(value = "拼团商品单价")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "开始时间")
-    private String addTime;
-
-    private String stopTime;
-
-    @ApiModelProperty(value = "团长id 0为团长")
-    private Integer kId;
-
-    @ApiModelProperty(value = "是否发送模板消息0未发送1已发送")
-    private Boolean isTpl;
-
-    @ApiModelProperty(value = "是否退款 0未退款 1已退款")
-    private Boolean isRefund;
-
-    @ApiModelProperty(value = "状态1进行中2已完成3未完成")
-    private Boolean status;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreService.java
deleted file mode 100644
index 96c94217..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.zbkj.crmeb.store.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 客服表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-06-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_service")
-@ApiModel(value="StoreService对象", description="客服表")
-public class StoreService implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "客服id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "客服uid")
-    private Integer uid;
-
-    @ApiModelProperty(value = "客服头像")
-    private String avatar;
-
-    @ApiModelProperty(value = "代理名称")
-    private String nickname;
-
-    @ApiModelProperty(value = "添加时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "0隐藏1显示")
-    private Boolean status;
-
-    @ApiModelProperty(value = "订单通知1开启0关闭")
-    private Integer notify;
-
-    @ApiModelProperty(value = "是否展示统计管理")
-    private Boolean customer;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreServiceLog.java b/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreServiceLog.java
deleted file mode 100644
index 43eba8a7..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/model/StoreServiceLog.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.zbkj.crmeb.store.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 客服用户对话记录表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-06-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_service_log")
-@ApiModel(value="StoreServiceLog对象", description="客服用户对话记录表")
-public class StoreServiceLog implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "客服用户对话记录表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "消息内容")
-    private String msn;
-
-    @ApiModelProperty(value = "发送人uid")
-    private Integer uid;
-
-    @ApiModelProperty(value = "接收人uid")
-    private Integer toUid;
-
-    @ApiModelProperty(value = "添加时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "是否已读（0：否；1：是；）")
-    private Boolean type;
-
-    @ApiModelProperty(value = "是否提醒过")
-    private Boolean remind;
-
-    @ApiModelProperty(value = "消息类型 1=文字 2=表情 3=图片 4=语音")
-    private Boolean msnType;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainRequest.java
deleted file mode 100644
index 8798b797..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainRequest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StoreBargainRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2815:30
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_bargain")
-@ApiModel(value="StoreBargain对象", description="砍价表")
-public class StoreBargainRequest {
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "砍价商品ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "关联商品ID")
-    private Integer productId;
-
-    @ApiModelProperty(value = "砍价活动名称")
-    private String title;
-
-    @ApiModelProperty(value = "砍价活动图片")
-    private String image;
-
-    @ApiModelProperty(value = "单位名称")
-    private String unitName;
-
-    @ApiModelProperty(value = "库存")
-    private Integer stock;
-
-    @ApiModelProperty(value = "销量")
-    private Integer sales;
-
-    @ApiModelProperty(value = "砍价商品轮播图")
-    private String images;
-
-    @ApiModelProperty(value = "砍价开启时间")
-    private Integer startTime;
-
-    @ApiModelProperty(value = "砍价结束时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "砍价商品名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "砍价金额")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "砍价商品最低价")
-    private BigDecimal minPrice;
-
-    @ApiModelProperty(value = "每次购买的砍价商品数量")
-    private Integer num;
-
-    @ApiModelProperty(value = "用户每次砍价的最大金额")
-    private BigDecimal bargainMaxPrice;
-
-    @ApiModelProperty(value = "用户每次砍价的最小金额")
-    private BigDecimal bargainMinPrice;
-
-    @ApiModelProperty(value = "用户每次砍价的次数")
-    private Integer bargainNum;
-
-    @ApiModelProperty(value = "砍价状态 0(到砍价时间不自动开启)  1(到砍价时间自动开启时间)")
-    private Boolean status;
-
-    @ApiModelProperty(value = "反多少积分")
-    private BigDecimal giveIntegral;
-
-    @ApiModelProperty(value = "砍价活动简介")
-    private String info;
-
-    @ApiModelProperty(value = "成本价")
-    private BigDecimal cost;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "是否推荐0不推荐1推荐")
-    private Boolean isHot;
-
-    @ApiModelProperty(value = "是否删除 0未删除 1删除")
-    private Boolean isDel;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-
-    @ApiModelProperty(value = "是否包邮 0不包邮 1包邮")
-    private Boolean isPostage;
-
-    @ApiModelProperty(value = "邮费")
-    private BigDecimal postage;
-
-    @ApiModelProperty(value = "砍价规则")
-    private String rule;
-
-    @ApiModelProperty(value = "砍价商品浏览量")
-    private Integer look;
-
-    @ApiModelProperty(value = "砍价商品分享量")
-    private Integer share;
-
-    @ApiModelProperty(value = "运费模板ID")
-    private Integer tempId;
-
-    @ApiModelProperty(value = "重量")
-    private BigDecimal weight;
-
-    @ApiModelProperty(value = "体积")
-    private BigDecimal volume;
-
-    @ApiModelProperty(value = "限购总数")
-    private Integer quota;
-
-    @ApiModelProperty(value = "限量总数显示")
-    private Integer quotaShow;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainSearchRequest.java
deleted file mode 100644
index 76191857..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainSearchRequest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StoreBargainSearchRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2815:28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_bargain")
-@ApiModel(value="StoreBargain对象", description="砍价表")
-public class StoreBargainSearchRequest {
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "砍价商品ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "关联商品ID")
-    private Integer productId;
-
-    @ApiModelProperty(value = "砍价活动名称")
-    private String title;
-
-    @ApiModelProperty(value = "砍价活动图片")
-    private String image;
-
-    @ApiModelProperty(value = "单位名称")
-    private String unitName;
-
-    @ApiModelProperty(value = "库存")
-    private Integer stock;
-
-    @ApiModelProperty(value = "销量")
-    private Integer sales;
-
-    @ApiModelProperty(value = "砍价商品轮播图")
-    private String images;
-
-    @ApiModelProperty(value = "砍价开启时间")
-    private Integer startTime;
-
-    @ApiModelProperty(value = "砍价结束时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "砍价商品名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "砍价金额")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "砍价商品最低价")
-    private BigDecimal minPrice;
-
-    @ApiModelProperty(value = "每次购买的砍价商品数量")
-    private Integer num;
-
-    @ApiModelProperty(value = "用户每次砍价的最大金额")
-    private BigDecimal bargainMaxPrice;
-
-    @ApiModelProperty(value = "用户每次砍价的最小金额")
-    private BigDecimal bargainMinPrice;
-
-    @ApiModelProperty(value = "用户每次砍价的次数")
-    private Integer bargainNum;
-
-    @ApiModelProperty(value = "砍价状态 0(到砍价时间不自动开启)  1(到砍价时间自动开启时间)")
-    private Boolean status;
-
-    @ApiModelProperty(value = "反多少积分")
-    private BigDecimal giveIntegral;
-
-    @ApiModelProperty(value = "砍价活动简介")
-    private String info;
-
-    @ApiModelProperty(value = "成本价")
-    private BigDecimal cost;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "是否推荐0不推荐1推荐")
-    private Boolean isHot;
-
-    @ApiModelProperty(value = "是否删除 0未删除 1删除")
-    private Boolean isDel;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-
-    @ApiModelProperty(value = "是否包邮 0不包邮 1包邮")
-    private Boolean isPostage;
-
-    @ApiModelProperty(value = "邮费")
-    private BigDecimal postage;
-
-    @ApiModelProperty(value = "砍价规则")
-    private String rule;
-
-    @ApiModelProperty(value = "砍价商品浏览量")
-    private Integer look;
-
-    @ApiModelProperty(value = "砍价商品分享量")
-    private Integer share;
-
-    @ApiModelProperty(value = "运费模板ID")
-    private Integer tempId;
-
-    @ApiModelProperty(value = "重量")
-    private BigDecimal weight;
-
-    @ApiModelProperty(value = "体积")
-    private BigDecimal volume;
-
-    @ApiModelProperty(value = "限购总数")
-    private Integer quota;
-
-    @ApiModelProperty(value = "限量总数显示")
-    private Integer quotaShow;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserHelpRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserHelpRequest.java
deleted file mode 100644
index 2dc13b9d..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserHelpRequest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StoreBargainUserHelpRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2815:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_bargain_user_help")
-@ApiModel(value="StoreBargainUserHelp对象", description="砍价用户帮助表")
-public class StoreBargainUserHelpRequest {
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "砍价用户帮助表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "帮助的用户id")
-    private Integer uid;
-
-    @ApiModelProperty(value = "砍价商品ID")
-    private Integer bargainId;
-
-    @ApiModelProperty(value = "用户参与砍价表id")
-    private Integer bargainUserId;
-
-    @ApiModelProperty(value = "帮助砍价多少金额")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserHelpSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserHelpSearchRequest.java
deleted file mode 100644
index 941112e1..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserHelpSearchRequest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StoreBargainUserHelpSearchRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2815:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_bargain_user_help")
-@ApiModel(value="StoreBargainUserHelp对象", description="砍价用户帮助表")
-public class StoreBargainUserHelpSearchRequest {
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "砍价用户帮助表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "帮助的用户id")
-    private Integer uid;
-
-    @ApiModelProperty(value = "砍价商品ID")
-    private Integer bargainId;
-
-    @ApiModelProperty(value = "用户参与砍价表id")
-    private Integer bargainUserId;
-
-    @ApiModelProperty(value = "帮助砍价多少金额")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserRequest.java
deleted file mode 100644
index 7f9301c1..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserRequest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StoreBargainUserRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2815:37
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_bargain_user")
-@ApiModel(value="StoreBargainUser对象", description="用户参与砍价表")
-public class StoreBargainUserRequest {
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "用户参与砍价表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer uid;
-
-    @ApiModelProperty(value = "砍价商品id")
-    private Integer bargainId;
-
-    @ApiModelProperty(value = "砍价的最低价")
-    private BigDecimal bargainPriceMin;
-
-    @ApiModelProperty(value = "砍价金额")
-    private BigDecimal bargainPrice;
-
-    @ApiModelProperty(value = "砍掉的价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "状态 1参与中 2 活动结束参与失败 3活动结束参与成功")
-    private Boolean status;
-
-    @ApiModelProperty(value = "参与时间")
-    private Integer addTime;
-
-    @ApiModelProperty(value = "是否取消")
-    private Boolean isDel;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserSearchRequest.java
deleted file mode 100644
index b7ca56d4..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreBargainUserSearchRequest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StoreBargainUserSearchRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2815:35
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_bargain_user")
-@ApiModel(value="StoreBargainUser对象", description="用户参与砍价表")
-public class StoreBargainUserSearchRequest {
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "用户参与砍价表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer uid;
-
-    @ApiModelProperty(value = "砍价商品id")
-    private Integer bargainId;
-
-    @ApiModelProperty(value = "砍价的最低价")
-    private BigDecimal bargainPriceMin;
-
-    @ApiModelProperty(value = "砍价金额")
-    private BigDecimal bargainPrice;
-
-    @ApiModelProperty(value = "砍掉的价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "状态 1参与中 2 活动结束参与失败 3活动结束参与成功")
-    private Boolean status;
-
-    @ApiModelProperty(value = "参与时间")
-    private Integer addTime;
-
-    @ApiModelProperty(value = "是否取消")
-    private Boolean isDel;
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCategoryRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCategoryRequest.java
deleted file mode 100644
index b9178fa0..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCategoryRequest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @author stivepeim
- * @title: StoreCategoryRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2815:58
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_category")
-@ApiModel(value="StoreCategory对象", description="商品分类表")
-public class StoreCategoryRequest {
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "商品分类表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "父id")
-    private Integer pid;
-
-    @ApiModelProperty(value = "分类名称")
-    private String cateName;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "图标")
-    private String pic;
-
-    @ApiModelProperty(value = "是否推荐")
-    private Boolean isShow;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCategorySearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCategorySearchRequest.java
deleted file mode 100644
index 66a04ae4..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCategorySearchRequest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @author stivepeim
- * @title: StoreCategorySearchRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2815:56
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_category")
-@ApiModel(value="StoreCategory对象", description="商品分类表")
-public class StoreCategorySearchRequest {
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "商品分类表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "父id")
-    private Integer pid;
-
-    @ApiModelProperty(value = "分类名称")
-    private String cateName;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "图标")
-    private String pic;
-
-    @ApiModelProperty(value = "是否推荐")
-    private Boolean isShow;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCombinationRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCombinationRequest.java
deleted file mode 100644
index 2e1fed0d..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCombinationRequest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StoreCombinationRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2816:02
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_combination")
-@ApiModel(value="StoreCombination对象", description="拼团商品表")
-public class StoreCombinationRequest {
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "商品id")
-    private Integer productId;
-
-    @ApiModelProperty(value = "商户id")
-    private Integer merId;
-
-    @ApiModelProperty(value = "推荐图")
-    private String image;
-
-    @ApiModelProperty(value = "轮播图")
-    private String images;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "活动属性")
-    private String attr;
-
-    @ApiModelProperty(value = "参团人数")
-    private Integer people;
-
-    @ApiModelProperty(value = "简介")
-    private String info;
-
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "销量")
-    private Integer sales;
-
-    @ApiModelProperty(value = "库存")
-    private Integer stock;
-
-    @ApiModelProperty(value = "添加时间")
-    private String addTime;
-
-    @ApiModelProperty(value = "推荐")
-    private Boolean isHost;
-
-    @ApiModelProperty(value = "商品状态")
-    private Boolean isShow;
-
-    private Boolean isDel;
-
-    private Boolean combination;
-
-    @ApiModelProperty(value = "商户是否可用1可用0不可用")
-    private Boolean merUse;
-
-    @ApiModelProperty(value = "是否包邮1是0否")
-    private Boolean isPostage;
-
-    @ApiModelProperty(value = "邮费")
-    private BigDecimal postage;
-
-    @ApiModelProperty(value = "拼团开始时间")
-    private Integer startTime;
-
-    @ApiModelProperty(value = "拼团结束时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "拼团订单有效时间")
-    private Integer effectiveTime;
-
-    @ApiModelProperty(value = "拼图商品成本")
-    private Integer cost;
-
-    @ApiModelProperty(value = "浏览量")
-    private Integer browse;
-
-    @ApiModelProperty(value = "单位名")
-    private String unitName;
-
-    @ApiModelProperty(value = "运费模板ID")
-    private Integer tempId;
-
-    @ApiModelProperty(value = "重量")
-    private BigDecimal weight;
-
-    @ApiModelProperty(value = "体积")
-    private BigDecimal volume;
-
-    @ApiModelProperty(value = "单次购买数量")
-    private Integer num;
-
-    @ApiModelProperty(value = "限购总数")
-    private Integer quota;
-
-    @ApiModelProperty(value = "限量总数显示")
-    private Integer quotaShow;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCombinationSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCombinationSearchRequest.java
deleted file mode 100644
index 85f84aed..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreCombinationSearchRequest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StoreCombinationSearchRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2816:01
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_combination")
-@ApiModel(value="StoreCombination对象", description="拼团商品表")
-public class StoreCombinationSearchRequest {
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "商品id")
-    private Integer productId;
-
-    @ApiModelProperty(value = "商户id")
-    private Integer merId;
-
-    @ApiModelProperty(value = "推荐图")
-    private String image;
-
-    @ApiModelProperty(value = "轮播图")
-    private String images;
-
-    @ApiModelProperty(value = "活动标题")
-    private String title;
-
-    @ApiModelProperty(value = "活动属性")
-    private String attr;
-
-    @ApiModelProperty(value = "参团人数")
-    private Integer people;
-
-    @ApiModelProperty(value = "简介")
-    private String info;
-
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "销量")
-    private Integer sales;
-
-    @ApiModelProperty(value = "库存")
-    private Integer stock;
-
-    @ApiModelProperty(value = "添加时间")
-    private String addTime;
-
-    @ApiModelProperty(value = "推荐")
-    private Boolean isHost;
-
-    @ApiModelProperty(value = "商品状态")
-    private Boolean isShow;
-
-    private Boolean isDel;
-
-    private Boolean combination;
-
-    @ApiModelProperty(value = "商户是否可用1可用0不可用")
-    private Boolean merUse;
-
-    @ApiModelProperty(value = "是否包邮1是0否")
-    private Boolean isPostage;
-
-    @ApiModelProperty(value = "邮费")
-    private BigDecimal postage;
-
-    @ApiModelProperty(value = "拼团开始时间")
-    private Integer startTime;
-
-    @ApiModelProperty(value = "拼团结束时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "拼团订单有效时间")
-    private Integer effectiveTime;
-
-    @ApiModelProperty(value = "拼图商品成本")
-    private Integer cost;
-
-    @ApiModelProperty(value = "浏览量")
-    private Integer browse;
-
-    @ApiModelProperty(value = "单位名")
-    private String unitName;
-
-    @ApiModelProperty(value = "运费模板ID")
-    private Integer tempId;
-
-    @ApiModelProperty(value = "重量")
-    private BigDecimal weight;
-
-    @ApiModelProperty(value = "体积")
-    private BigDecimal volume;
-
-    @ApiModelProperty(value = "单次购买数量")
-    private Integer num;
-
-    @ApiModelProperty(value = "限购总数")
-    private Integer quota;
-
-    @ApiModelProperty(value = "限量总数显示")
-    private Integer quotaShow;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderInfoRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderInfoRequest.java
deleted file mode 100644
index 1feabc34..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderInfoRequest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @author stivepeim
- * @title: StoreOrderInfoRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2816:09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="StoreOrderInfoRequest对象", description="订单购物详情表")
-public class StoreOrderInfoRequest {
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "订单id")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "商品ID")
-    private Integer productId;
-
-    @ApiModelProperty(value = "购买东西的详细信息")
-    private String info;
-
-    @ApiModelProperty(value = "唯一id")
-    private String unique;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StorePinkRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StorePinkRequest.java
deleted file mode 100644
index e2aa2cdf..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StorePinkRequest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StorePinkRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2816:13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_pink")
-@ApiModel(value="StorePink对象", description="拼团表")
-public class StorePinkRequest {
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户id")
-    private Integer uid;
-
-    @ApiModelProperty(value = "订单id 生成")
-    private String orderId;
-
-    @ApiModelProperty(value = "订单id  数据库")
-    private Integer orderIdKey;
-
-    @ApiModelProperty(value = "购买商品个数")
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "购买总金额")
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "拼团商品id")
-    private Integer cid;
-
-    @ApiModelProperty(value = "商品id")
-    private Integer pid;
-
-    @ApiModelProperty(value = "拼图总人数")
-    private Integer people;
-
-    @ApiModelProperty(value = "拼团商品单价")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "开始时间")
-    private String addTime;
-
-    private String stopTime;
-
-    @ApiModelProperty(value = "团长id 0为团长")
-    private Integer kId;
-
-    @ApiModelProperty(value = "是否发送模板消息0未发送1已发送")
-    private Boolean isTpl;
-
-    @ApiModelProperty(value = "是否退款 0未退款 1已退款")
-    private Boolean isRefund;
-
-    @ApiModelProperty(value = "状态1进行中2已完成3未完成")
-    private Boolean status;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StorePinkSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StorePinkSearchRequest.java
deleted file mode 100644
index c5f6aa91..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StorePinkSearchRequest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @author stivepeim
- * @title: StorePinkSearchRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/5/2816:05
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_pink")
-@ApiModel(value="StorePink对象", description="拼团表")
-public class StorePinkSearchRequest {
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户id")
-    private Integer uid;
-
-    @ApiModelProperty(value = "订单id 生成")
-    private String orderId;
-
-    @ApiModelProperty(value = "订单id  数据库")
-    private Integer orderIdKey;
-
-    @ApiModelProperty(value = "购买商品个数")
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "购买总金额")
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "拼团商品id")
-    private Integer cid;
-
-    @ApiModelProperty(value = "商品id")
-    private Integer pid;
-
-    @ApiModelProperty(value = "拼图总人数")
-    private Integer people;
-
-    @ApiModelProperty(value = "拼团商品单价")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "开始时间")
-    private String addTime;
-
-    private String stopTime;
-
-    @ApiModelProperty(value = "团长id 0为团长")
-    private Integer kId;
-
-    @ApiModelProperty(value = "是否发送模板消息0未发送1已发送")
-    private Boolean isTpl;
-
-    @ApiModelProperty(value = "是否退款 0未退款 1已退款")
-    private Boolean isRefund;
-
-    @ApiModelProperty(value = "状态1进行中2已完成3未完成")
-    private Boolean status;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductCateRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductCateRequest.java
deleted file mode 100644
index 683230a8..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductCateRequest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 商品分类辅助表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-05-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_product_cate")
-@ApiModel(value="StoreProductCate对象", description="商品分类辅助表")
-public class StoreProductCateRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "商品id")
-    private Integer productId;
-
-    @ApiModelProperty(value = "分类id")
-    private Integer cateId;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductCouponRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductCouponRequest.java
deleted file mode 100644
index 7ba31e0a..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductCouponRequest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author stivepeim
- * @title: StoreProductCouponRequest
- * @projectName crmeb
- * @description: 产品和优惠券关联
- * @date 2020/8/711:07
- */
-
-@Data
-public class StoreProductCouponRequest {
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "商品id")
-    private Integer productId;
-
-    @ApiModelProperty(value = "优惠劵id")
-    private Integer issueCouponId;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductCouponSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductCouponSearchRequest.java
deleted file mode 100644
index 94f3f550..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreProductCouponSearchRequest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-/**
- * @author stivepeim
- * @title: StoreProductCouponSearchRequest
- * @projectName crmeb
- * @description: TODO
- * @date 2020/8/711:05
- */
-public class StoreProductCouponSearchRequest {
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreServiceLogSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreServiceLogSearchRequest.java
deleted file mode 100644
index a7b16a62..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreServiceLogSearchRequest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 客服用户对话记录表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-06-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_service_log")
-@ApiModel(value="StoreServiceLog对象", description="客服用户对话记录表")
-public class StoreServiceLogSearchRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "发送人uid")
-    private Integer uid;
-
-    @ApiModelProperty(value = "接收人uid")
-    private Integer toUid;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreServiceRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreServiceRequest.java
deleted file mode 100644
index 119b143c..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreServiceRequest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.zbkj.crmeb.store.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 客服表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-06-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_service")
-@ApiModel(value="StoreService对象", description="客服表")
-public class StoreServiceRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "客服uid")
-    private Integer uid;
-
-    @ApiModelProperty(value = "客服头像")
-    private String avatar;
-
-    @ApiModelProperty(value = "代理名称")
-    private String nickname;
-
-    @ApiModelProperty(value = "0隐藏1显示")
-    private Boolean status;
-
-    @ApiModelProperty(value = "订单通知1开启0关闭")
-    private Integer notify;
-
-    @ApiModelProperty(value = "是否展示统计管理")
-    private Boolean customer;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreBargainService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreBargainService.java
deleted file mode 100644
index c592c49a..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreBargainService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zbkj.crmeb.store.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreBargain;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.store.request.StoreBargainSearchRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreBargainService 接口
-* @date 2020-05-28
-*/
-public interface StoreBargainService extends IService<StoreBargain> {
-
-    List<StoreBargain> getList(StoreBargainSearchRequest request, PageParamRequest pageParamRequest);
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreBargainUserHelpService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreBargainUserHelpService.java
deleted file mode 100644
index c96cf94c..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreBargainUserHelpService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zbkj.crmeb.store.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreBargainUserHelp;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.store.request.StoreBargainUserHelpSearchRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreBargainUserHelpService 接口
-* @date 2020-05-28
-*/
-public interface StoreBargainUserHelpService extends IService<StoreBargainUserHelp> {
-
-    List<StoreBargainUserHelp> getList(StoreBargainUserHelpSearchRequest request, PageParamRequest pageParamRequest);
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreBargainUserService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreBargainUserService.java
deleted file mode 100644
index ab1c56e2..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreBargainUserService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zbkj.crmeb.store.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreBargainUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.store.request.StoreBargainUserSearchRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreBargainUserService 接口
-* @date 2020-05-28
-*/
-public interface StoreBargainUserService extends IService<StoreBargainUser> {
-
-    List<StoreBargainUser> getList(StoreBargainUserSearchRequest request, PageParamRequest pageParamRequest);
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreCategoryService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreCategoryService.java
deleted file mode 100644
index 39b8d8a9..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreCategoryService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.zbkj.crmeb.store.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreCategory;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.store.request.StoreCategorySearchRequest;
-import com.zbkj.crmeb.store.response.StoreCategoryTreeList;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreCategoryService 接口
-* @date 2020-05-28
-*/
-public interface StoreCategoryService extends IService<StoreCategory> {
-
-    List<StoreCategory> getList(StoreCategorySearchRequest request, PageParamRequest pageParamRequest);
-
-//    List<StoreCategoryTreeList> getTreeList(Integer pid, Integer isShow);
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreCombinationService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreCombinationService.java
deleted file mode 100644
index ac2fc0c9..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreCombinationService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zbkj.crmeb.store.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreCombination;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.store.request.StoreCombinationSearchRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreCombinationService 接口
-* @date 2020-05-28
-*/
-public interface StoreCombinationService extends IService<StoreCombination> {
-
-    List<StoreCombination> getList(StoreCombinationSearchRequest request, PageParamRequest pageParamRequest);
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StorePinkService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StorePinkService.java
deleted file mode 100644
index 4eef3124..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StorePinkService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zbkj.crmeb.store.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StorePink;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.store.request.StorePinkSearchRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StorePinkService 接口
-* @date 2020-05-28
-*/
-public interface StorePinkService extends IService<StorePink> {
-
-    List<StorePink> getList(StorePinkSearchRequest request, PageParamRequest pageParamRequest);
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreServiceLogService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreServiceLogService.java
deleted file mode 100644
index 297ae9a7..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreServiceLogService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zbkj.crmeb.store.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreServiceLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.store.request.StoreServiceLogSearchRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreServiceLogService 接口
-* @date 2020-06-10
-*/
-public interface StoreServiceLogService extends IService<StoreServiceLog> {
-
-    List<StoreServiceLog> getList(StoreServiceLogSearchRequest request, PageParamRequest pageParamRequest);
-}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreServiceService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreServiceService.java
deleted file mode 100644
index c89a66fc..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreServiceService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zbkj.crmeb.store.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.store.model.StoreService;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreServiceService 接口
-* @date 2020-06-10
-*/
-public interface StoreServiceService extends IService<StoreService> {
-
-    List<StoreService> getList(PageParamRequest pageParamRequest);
-}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreBargainServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreBargainServiceImpl.java
deleted file mode 100644
index 901b79ae..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreBargainServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-
-import com.zbkj.crmeb.store.model.StoreBargain;
-import com.zbkj.crmeb.store.dao.StoreBargainDao;
-import com.zbkj.crmeb.store.request.StoreBargainSearchRequest;
-import com.zbkj.crmeb.store.service.StoreBargainService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreBargainServiceImpl 接口实现
-* @date 2020-05-28
-*/
-@Service
-public class StoreBargainServiceImpl extends ServiceImpl<StoreBargainDao, StoreBargain> implements StoreBargainService {
-
-    @Resource
-    private StoreBargainDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-05-28
-    * @return List<StoreBargain>
-    */
-    @Override
-    public List<StoreBargain> getList(StoreBargainSearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-
-        //带 StoreBargain 类的多条件查询
-        LambdaQueryWrapper<StoreBargain> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        StoreBargain model = new StoreBargain();
-        BeanUtils.copyProperties(request, model);
-        lambdaQueryWrapper.setEntity(model);
-        return dao.selectList(lambdaQueryWrapper);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreBargainUserHelpServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreBargainUserHelpServiceImpl.java
deleted file mode 100644
index 323f9e0d..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreBargainUserHelpServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-
-import com.zbkj.crmeb.store.model.StoreBargainUserHelp;
-import com.zbkj.crmeb.store.dao.StoreBargainUserHelpDao;
-import com.zbkj.crmeb.store.request.StoreBargainUserHelpSearchRequest;
-import com.zbkj.crmeb.store.service.StoreBargainUserHelpService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreBargainUserHelpServiceImpl 接口实现
-* @date 2020-05-28
-*/
-@Service
-public class StoreBargainUserHelpServiceImpl extends ServiceImpl<StoreBargainUserHelpDao, StoreBargainUserHelp> implements StoreBargainUserHelpService {
-
-    @Resource
-    private StoreBargainUserHelpDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-05-28
-    * @return List<StoreBargainUserHelp>
-    */
-    @Override
-    public List<StoreBargainUserHelp> getList(StoreBargainUserHelpSearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-
-        //带 StoreBargainUserHelp 类的多条件查询
-        LambdaQueryWrapper<StoreBargainUserHelp> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        StoreBargainUserHelp model = new StoreBargainUserHelp();
-        BeanUtils.copyProperties(request, model);
-        lambdaQueryWrapper.setEntity(model);
-        return dao.selectList(lambdaQueryWrapper);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreBargainUserServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreBargainUserServiceImpl.java
deleted file mode 100644
index 7eb35416..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreBargainUserServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-
-import com.zbkj.crmeb.store.model.StoreBargainUser;
-import com.zbkj.crmeb.store.dao.StoreBargainUserDao;
-import com.zbkj.crmeb.store.request.StoreBargainUserSearchRequest;
-import com.zbkj.crmeb.store.service.StoreBargainUserService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreBargainUserServiceImpl 接口实现
-* @date 2020-05-28
-*/
-@Service
-public class StoreBargainUserServiceImpl extends ServiceImpl<StoreBargainUserDao, StoreBargainUser> implements StoreBargainUserService {
-
-    @Resource
-    private StoreBargainUserDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-05-28
-    * @return List<StoreBargainUser>
-    */
-    @Override
-    public List<StoreBargainUser> getList(StoreBargainUserSearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-
-        //带 StoreBargainUser 类的多条件查询
-        LambdaQueryWrapper<StoreBargainUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        StoreBargainUser model = new StoreBargainUser();
-        BeanUtils.copyProperties(request, model);
-        lambdaQueryWrapper.setEntity(model);
-        return dao.selectList(lambdaQueryWrapper);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreCategoryServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreCategoryServiceImpl.java
deleted file mode 100644
index d1ccaeec..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreCategoryServiceImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-
-import com.zbkj.crmeb.store.model.StoreCategory;
-import com.zbkj.crmeb.store.dao.StoreCategoryDao;
-import com.zbkj.crmeb.store.request.StoreCategorySearchRequest;
-import com.zbkj.crmeb.store.response.StoreCategoryTreeList;
-import com.zbkj.crmeb.store.service.StoreCategoryService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
-/**
-* @author Mr.Zhang
-* @description StoreCategoryServiceImpl 接口实现
-* @date 2020-05-28
-*/
-@Service
-public class StoreCategoryServiceImpl extends ServiceImpl<StoreCategoryDao, StoreCategory> implements StoreCategoryService {
-
-    @Resource
-    private StoreCategoryDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-05-28
-    * @return List<StoreCategory>
-    */
-    @Override
-    public List<StoreCategory> getList(StoreCategorySearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-
-        //带 StoreCategory 类的多条件查询
-        LambdaQueryWrapper<StoreCategory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        StoreCategory model = new StoreCategory();
-        BeanUtils.copyProperties(request, model);
-        lambdaQueryWrapper.setEntity(model);
-        return dao.selectList(lambdaQueryWrapper);
-    }
-
-//    @Override
-//    public List<StoreCategoryTreeList> getTreeList(Integer pid, Integer isShow){
-//        List<StoreCategoryTreeList> treeList = new ArrayList<>();
-//        LambdaQueryWrapper<StoreCategory> lqw = new LambdaQueryWrapper<>();
-//        lqw.eq(StoreCategory::getId, pid);
-//        if(isShow >= 0){
-//            lqw.eq(StoreCategory::getIsShow, isShow);
-//        }
-//        lqw.orderByDesc(StoreCategory::getSort);
-//        List<StoreCategory> allList = dao.selectList(lqw);
-//        Map<Integer, StoreCategory> allListMap = allList.stream()
-//                .distinct().collect(Collectors.toMap(StoreCategory::getId,(p) -> p));
-//        System.out.println("allListMap:"+allListMap);
-//        return treeList;
-//    }
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreCombinationServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreCombinationServiceImpl.java
deleted file mode 100644
index 771699da..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreCombinationServiceImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-
-import com.zbkj.crmeb.store.model.StoreCombination;
-import com.zbkj.crmeb.store.dao.StoreCombinationDao;
-import com.zbkj.crmeb.store.request.StoreCombinationSearchRequest;
-import com.zbkj.crmeb.store.service.StoreCombinationService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StoreCombinationServiceImpl 接口实现
-* @date 2020-05-28
-*/
-@Service
-public class StoreCombinationServiceImpl extends ServiceImpl<StoreCombinationDao, StoreCombination>
-        implements StoreCombinationService {
-
-    @Resource
-    private StoreCombinationDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-05-28
-    * @return List<StoreCombination>
-    */
-    @Override
-    public List<StoreCombination> getList(StoreCombinationSearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-
-        //带 StoreCombination 类的多条件查询
-        LambdaQueryWrapper<StoreCombination> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        StoreCombination model = new StoreCombination();
-        BeanUtils.copyProperties(request, model);
-        lambdaQueryWrapper.setEntity(model);
-        return dao.selectList(lambdaQueryWrapper);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StorePinkServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StorePinkServiceImpl.java
deleted file mode 100644
index c2c4fa5b..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StorePinkServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-
-import com.zbkj.crmeb.store.model.StorePink;
-import com.zbkj.crmeb.store.dao.StorePinkDao;
-import com.zbkj.crmeb.store.request.StorePinkSearchRequest;
-import com.zbkj.crmeb.store.service.StorePinkService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @description StorePinkServiceImpl 接口实现
-* @date 2020-05-28
-*/
-@Service
-public class StorePinkServiceImpl extends ServiceImpl<StorePinkDao, StorePink> implements StorePinkService {
-
-    @Resource
-    private StorePinkDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-05-28
-    * @return List<StorePink>
-    */
-    @Override
-    public List<StorePink> getList(StorePinkSearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-
-        //带 StorePink 类的多条件查询
-        LambdaQueryWrapper<StorePink> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        StorePink model = new StorePink();
-        BeanUtils.copyProperties(request, model);
-        lambdaQueryWrapper.setEntity(model);
-        return dao.selectList(lambdaQueryWrapper);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreServiceLogServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreServiceLogServiceImpl.java
deleted file mode 100644
index 1ebaab55..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreServiceLogServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-
-import com.zbkj.crmeb.store.model.StoreServiceLog;
-import com.zbkj.crmeb.store.dao.StoreServiceLogDao;
-import com.zbkj.crmeb.store.request.StoreServiceLogSearchRequest;
-import com.zbkj.crmeb.store.service.StoreServiceLogService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description StoreServiceLogServiceImpl 接口实现
-* @since 2020-06-10
-*/
-@Service
-public class StoreServiceLogServiceImpl extends ServiceImpl<StoreServiceLogDao, StoreServiceLog> implements StoreServiceLogService {
-
-    @Resource
-    private StoreServiceLogDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-06-10
-    * @return List<StoreServiceLog>
-    */
-    @Override
-    public List<StoreServiceLog> getList(StoreServiceLogSearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-
-        //带 StoreServiceLog 类的多条件查询
-        LambdaQueryWrapper<StoreServiceLog> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        StoreServiceLog model = new StoreServiceLog();
-        BeanUtils.copyProperties(request, model);
-        lambdaQueryWrapper.setEntity(model);
-        lambdaQueryWrapper.orderByAsc(StoreServiceLog::getId);
-        return dao.selectList(lambdaQueryWrapper);
-    }
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreServiceServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreServiceServiceImpl.java
deleted file mode 100644
index 09829f37..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreServiceServiceImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-
-import com.zbkj.crmeb.store.model.StoreService;
-import com.zbkj.crmeb.store.dao.StoreServiceDao;
-import com.zbkj.crmeb.store.service.StoreServiceService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description StoreServiceServiceImpl 接口实现
-* @since 2020-06-10
-*/
-@Service
-public class StoreServiceServiceImpl extends ServiceImpl<StoreServiceDao, StoreService> implements StoreServiceService {
-
-    @Resource
-    private StoreServiceDao dao;
-
-
-    /**
-    * 列表
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-06-10
-    * @return List<StoreService>
-    */
-    @Override
-    public List<StoreService> getList(PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        LambdaQueryWrapper<StoreService> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.orderByDesc(StoreService::getId);
-        return dao.selectList(lambdaQueryWrapper);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemLogController.java b/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemLogController.java
deleted file mode 100644
index 656a5fb5..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemLogController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.zbkj.crmeb.system.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.system.request.SystemLogRequest;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.system.service.SystemLogService;
-import com.zbkj.crmeb.system.model.SystemLog;
-
-
-/**
- * 管理员操作记录表 前端控制器
- */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/system/log")
-@Api(tags = "设置 -- 管理员操作记录")
-public class SystemLogController {
-
-    @Autowired
-    private SystemLogService systemLogService;
-
-    /**
-     * 分页显示管理员操作记录表
-     * @param systemLogRequest 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "分页列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<SystemLog>>  getList(@ModelAttribute SystemLogRequest systemLogRequest, @ModelAttribute PageParamRequest pageParamRequest){
-        SystemLog systemLog = new SystemLog();
-        BeanUtils.copyProperties(systemLogRequest, systemLog);
-        CommonPage<SystemLog> systemLogCommonPage = CommonPage.restPage(systemLogService.getList(systemLogRequest, pageParamRequest));
-        return CommonResult.success(systemLogCommonPage);
-    }
-
-    /**
-     * 新增管理员操作记录表
-     * @param systemLogRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@ModelAttribute SystemLogRequest systemLogRequest){
-        SystemLog systemLog = new SystemLog();
-        BeanUtils.copyProperties(systemLogRequest, systemLog);
-
-        if(systemLogService.save(systemLog)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除管理员操作记录表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.GET)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(systemLogService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改管理员操作记录表
-     * @param id integer id
-     * @param systemLogRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @ModelAttribute SystemLogRequest systemLogRequest){
-        SystemLog systemLog = new SystemLog();
-        BeanUtils.copyProperties(systemLogRequest, systemLog);
-        systemLog.setId(id);
-
-        if(systemLogService.updateById(systemLog)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询管理员操作记录表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<SystemLog> info(@RequestParam(value = "id") Integer id){
-        SystemLog systemLog = systemLogService.getById(id);
-        return CommonResult.success(systemLog);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemNoticeAdminController.java b/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemNoticeAdminController.java
deleted file mode 100644
index f9cc44d0..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemNoticeAdminController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.zbkj.crmeb.system.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.system.request.SystemNoticeAdminRequest;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.system.service.SystemNoticeAdminService;
-import com.zbkj.crmeb.system.model.SystemNoticeAdmin;
-
-
-/**
- * 通知记录表 前端控制器
- */
-@Slf4j
-@RestController
-@RequestMapping("api/system/notice/admin")
-@Api(tags = "设置 -- 通知记录")
-public class SystemNoticeAdminController {
-
-    @Autowired
-    private SystemNoticeAdminService systemNoticeAdminService;
-
-    /**
-     * 分页显示通知记录表
-     * @param systemNoticeAdminRequest 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "分页列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<SystemNoticeAdmin>>  getList(@ModelAttribute SystemNoticeAdminRequest systemNoticeAdminRequest, @ModelAttribute PageParamRequest pageParamRequest){
-        SystemNoticeAdmin systemNoticeAdmin = new SystemNoticeAdmin();
-        BeanUtils.copyProperties(systemNoticeAdminRequest, systemNoticeAdmin);
-        CommonPage<SystemNoticeAdmin> systemNoticeAdminCommonPage = CommonPage.restPage(systemNoticeAdminService.getList(systemNoticeAdminRequest, pageParamRequest));
-        return CommonResult.success(systemNoticeAdminCommonPage);
-    }
-
-    /**
-     * 新增通知记录表
-     * @param systemNoticeAdminRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@ModelAttribute SystemNoticeAdminRequest systemNoticeAdminRequest){
-        SystemNoticeAdmin systemNoticeAdmin = new SystemNoticeAdmin();
-        BeanUtils.copyProperties(systemNoticeAdminRequest, systemNoticeAdmin);
-
-        if(systemNoticeAdminService.save(systemNoticeAdmin)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除通知记录表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.GET)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(systemNoticeAdminService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改通知记录表
-     * @param id integer id
-     * @param systemNoticeAdminRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @ModelAttribute SystemNoticeAdminRequest systemNoticeAdminRequest){
-        SystemNoticeAdmin systemNoticeAdmin = new SystemNoticeAdmin();
-        BeanUtils.copyProperties(systemNoticeAdminRequest, systemNoticeAdmin);
-        systemNoticeAdmin.setId(id);
-
-        if(systemNoticeAdminService.updateById(systemNoticeAdmin)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询通知记录表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<SystemNoticeAdmin> info(@RequestParam(value = "id") Integer id){
-        SystemNoticeAdmin systemNoticeAdmin = systemNoticeAdminService.getById(id);
-        return CommonResult.success(systemNoticeAdmin);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemNoticeController.java b/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemNoticeController.java
deleted file mode 100644
index 2495ceb1..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/controller/SystemNoticeController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.zbkj.crmeb.system.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.system.request.SystemNoticeRequest;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.system.service.SystemNoticeService;
-import com.zbkj.crmeb.system.model.SystemNotice;
-
-
-/**
- * 通知模板表 前端控制器
- */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/system/notice")
-@Api(tags = "设置 -- 通知记录 -- 通知模板")
-public class SystemNoticeController {
-
-    @Autowired
-    private SystemNoticeService systemNoticeService;
-
-    /**
-     * 分页显示通知模板表
-     * @param systemNoticeRequest 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "分页列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<SystemNotice>>  getList(@ModelAttribute SystemNoticeRequest systemNoticeRequest, @ModelAttribute PageParamRequest pageParamRequest){
-        SystemNotice systemNotice = new SystemNotice();
-        BeanUtils.copyProperties(systemNoticeRequest, systemNotice);
-        CommonPage<SystemNotice> systemNoticeCommonPage = CommonPage.restPage(systemNoticeService.getList(systemNoticeRequest, pageParamRequest));
-        return CommonResult.success(systemNoticeCommonPage);
-    }
-
-    /**
-     * 新增通知模板表
-     * @param systemNoticeRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@ModelAttribute SystemNoticeRequest systemNoticeRequest){
-        SystemNotice systemNotice = new SystemNotice();
-        BeanUtils.copyProperties(systemNoticeRequest, systemNotice);
-
-        if(systemNoticeService.save(systemNotice)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除通知模板表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.GET)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(systemNoticeService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改通知模板表
-     * @param id integer id
-     * @param systemNoticeRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @ModelAttribute SystemNoticeRequest systemNoticeRequest){
-        SystemNotice systemNotice = new SystemNotice();
-        BeanUtils.copyProperties(systemNoticeRequest, systemNotice);
-        systemNotice.setId(id);
-
-        if(systemNoticeService.updateById(systemNotice)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询通知模板表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-13
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<SystemNotice> info(@RequestParam(value = "id") Integer id){
-        SystemNotice systemNotice = systemNoticeService.getById(id);
-        return CommonResult.success(systemNotice);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemFileDao.java b/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemFileDao.java
deleted file mode 100644
index 3c4d9160..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemFileDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.system.dao;
-
-import com.zbkj.crmeb.system.model.SystemFile;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 文件对比表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-public interface SystemFileDao extends BaseMapper<SystemFile> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemLogDao.java b/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemLogDao.java
deleted file mode 100644
index a7cc1d4d..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemLogDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.system.dao;
-
-import com.zbkj.crmeb.system.model.SystemLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 管理员操作记录表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-public interface SystemLogDao extends BaseMapper<SystemLog> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemNoticeAdminDao.java b/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemNoticeAdminDao.java
deleted file mode 100644
index 3a9cea64..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemNoticeAdminDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.system.dao;
-
-import com.zbkj.crmeb.system.model.SystemNoticeAdmin;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 通知记录表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-public interface SystemNoticeAdminDao extends BaseMapper<SystemNoticeAdmin> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemNoticeDao.java b/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemNoticeDao.java
deleted file mode 100644
index ea38a455..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/dao/SystemNoticeDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.system.dao;
-
-import com.zbkj.crmeb.system.model.SystemNotice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 通知模板表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-public interface SystemNoticeDao extends BaseMapper<SystemNotice> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemFile.java b/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemFile.java
deleted file mode 100644
index ab8ddf2c..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemFile.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.zbkj.crmeb.system.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 文件对比表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_system_file")
-@ApiModel(value="SystemFile对象", description="文件对比表")
-public class SystemFile implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "文件对比ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "文件内容")
-    private String cthash;
-
-    @ApiModelProperty(value = "文价名称")
-    private String filename;
-
-    @ApiModelProperty(value = "上次访问时间")
-    private String atime;
-
-    @ApiModelProperty(value = "上次修改时间")
-    private String mtime;
-
-    @ApiModelProperty(value = "上次改变时间")
-    private String ctime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemLog.java b/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemLog.java
deleted file mode 100644
index 3d24915f..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemLog.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.zbkj.crmeb.system.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 管理员操作记录表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_system_log")
-@ApiModel(value="SystemLog对象", description="管理员操作记录表")
-public class SystemLog implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "管理员操作记录ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "管理员id")
-    private Integer adminId;
-
-    @ApiModelProperty(value = "管理员姓名")
-    private String adminName;
-
-    @ApiModelProperty(value = "链接")
-    private String path;
-
-    @ApiModelProperty(value = "行为")
-    private String page;
-
-    @ApiModelProperty(value = "访问类型")
-    private String method;
-
-    @ApiModelProperty(value = "登录IP")
-    private String ip;
-
-    @ApiModelProperty(value = "类型")
-    private String type;
-
-    @ApiModelProperty(value = "操作时间")
-    private Integer addTime;
-
-    @ApiModelProperty(value = "商户id")
-    private Integer merchantId;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemNotice.java b/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemNotice.java
deleted file mode 100644
index c320c70c..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemNotice.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.zbkj.crmeb.system.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 通知模板表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_system_notice")
-@ApiModel(value="SystemNotice对象", description="通知模板表")
-public class SystemNotice implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "通知模板id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "通知标题")
-    private String title;
-
-    @ApiModelProperty(value = "通知类型")
-    private String type;
-
-    @ApiModelProperty(value = "图标")
-    private String icon;
-
-    @ApiModelProperty(value = "链接")
-    private String url;
-
-    @ApiModelProperty(value = "通知数据")
-    private String tableTitle;
-
-    @ApiModelProperty(value = "通知模板")
-    private String template;
-
-    @ApiModelProperty(value = "通知管理员id")
-    private String pushAdmin;
-
-    @ApiModelProperty(value = "状态")
-    private Boolean status;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemNoticeAdmin.java b/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemNoticeAdmin.java
deleted file mode 100644
index b14724ce..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/model/SystemNoticeAdmin.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.zbkj.crmeb.system.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 通知记录表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_system_notice_admin")
-@ApiModel(value="SystemNoticeAdmin对象", description="通知记录表")
-public class SystemNoticeAdmin implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "通知记录ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "通知类型")
-    private String noticeType;
-
-    @ApiModelProperty(value = "通知的管理员")
-    private Integer adminId;
-
-    @ApiModelProperty(value = "关联ID")
-    private Integer linkId;
-
-    @ApiModelProperty(value = "通知的数据")
-    private String tableData;
-
-    @ApiModelProperty(value = "点击次数")
-    private Integer isClick;
-
-    @ApiModelProperty(value = "访问次数")
-    private Integer isVisit;
-
-    @ApiModelProperty(value = "访问时间")
-    private Integer visitTime;
-
-    @ApiModelProperty(value = "通知时间")
-    private Integer addTime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemFileRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemFileRequest.java
deleted file mode 100644
index 3e7f90ea..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemFileRequest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.zbkj.crmeb.system.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 文件对比表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_system_file")
-@ApiModel(value="SystemFile对象", description="文件对比表")
-public class SystemFileRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "文件对比ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "文件内容")
-    private String cthash;
-
-    @ApiModelProperty(value = "文价名称")
-    private String filename;
-
-    @ApiModelProperty(value = "上次访问时间")
-    private String atime;
-
-    @ApiModelProperty(value = "上次修改时间")
-    private String mtime;
-
-    @ApiModelProperty(value = "上次改变时间")
-    private String ctime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemLogRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemLogRequest.java
deleted file mode 100644
index 011ffe93..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemLogRequest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.zbkj.crmeb.system.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 管理员操作记录表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_system_log")
-@ApiModel(value="SystemLog对象", description="管理员操作记录表")
-public class SystemLogRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "管理员操作记录ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "管理员id")
-    private Integer adminId;
-
-    @ApiModelProperty(value = "管理员姓名")
-    private String adminName;
-
-    @ApiModelProperty(value = "链接")
-    private String path;
-
-    @ApiModelProperty(value = "行为")
-    private String page;
-
-    @ApiModelProperty(value = "访问类型")
-    private String method;
-
-    @ApiModelProperty(value = "登录IP")
-    private String ip;
-
-    @ApiModelProperty(value = "类型")
-    private String type;
-
-    @ApiModelProperty(value = "操作时间")
-    private Integer addTime;
-
-    @ApiModelProperty(value = "商户id")
-    private Integer merchantId;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemNoticeAdminRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemNoticeAdminRequest.java
deleted file mode 100644
index 47df4b51..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemNoticeAdminRequest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zbkj.crmeb.system.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 通知记录表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_system_notice_admin")
-@ApiModel(value="SystemNoticeAdmin对象", description="通知记录表")
-public class SystemNoticeAdminRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "通知记录ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "通知类型")
-    private String noticeType;
-
-    @ApiModelProperty(value = "通知的管理员")
-    private Integer adminId;
-
-    @ApiModelProperty(value = "关联ID")
-    private Integer linkId;
-
-    @ApiModelProperty(value = "通知的数据")
-    private String tableData;
-
-    @ApiModelProperty(value = "点击次数")
-    private Integer isClick;
-
-    @ApiModelProperty(value = "访问次数")
-    private Integer isVisit;
-
-    @ApiModelProperty(value = "访问时间")
-    private Integer visitTime;
-
-    @ApiModelProperty(value = "通知时间")
-    private Integer addTime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemNoticeRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemNoticeRequest.java
deleted file mode 100644
index 35c712b8..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/request/SystemNoticeRequest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zbkj.crmeb.system.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 通知模板表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_system_notice")
-@ApiModel(value="SystemNotice对象", description="通知模板表")
-public class SystemNoticeRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "通知模板id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "通知标题")
-    private String title;
-
-    @ApiModelProperty(value = "通知类型")
-    private String type;
-
-    @ApiModelProperty(value = "图标")
-    private String icon;
-
-    @ApiModelProperty(value = "链接")
-    private String url;
-
-    @ApiModelProperty(value = "通知数据")
-    private String tableTitle;
-
-    @ApiModelProperty(value = "通知模板")
-    private String template;
-
-    @ApiModelProperty(value = "通知管理员id")
-    private String pushAdmin;
-
-    @ApiModelProperty(value = "状态")
-    private Boolean status;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemFileService.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemFileService.java
deleted file mode 100644
index 906693df..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemFileService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zbkj.crmeb.system.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.system.model.SystemFile;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.system.request.SystemFileRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description SystemFileService 接口
-* @since 2020-04-13
-*/
-public interface SystemFileService extends IService<SystemFile> {
-    List<SystemFile> getList(SystemFileRequest request, PageParamRequest pageParamRequest);
-}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemLogService.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemLogService.java
deleted file mode 100644
index 778f3fd1..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemLogService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zbkj.crmeb.system.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.system.model.SystemLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.system.request.SystemLogRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description SystemLogService 接口
-* @since 2020-04-13
-*/
-public interface SystemLogService extends IService<SystemLog> {
-    List<SystemLog> getList(SystemLogRequest request, PageParamRequest pageParamRequest);
-}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemNoticeAdminService.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemNoticeAdminService.java
deleted file mode 100644
index 6f694c3b..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemNoticeAdminService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zbkj.crmeb.system.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.system.model.SystemNoticeAdmin;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.system.request.SystemNoticeAdminRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description SystemNoticeAdminService 接口
-* @since 2020-04-13
-*/
-public interface SystemNoticeAdminService extends IService<SystemNoticeAdmin> {
-    List<SystemNoticeAdmin> getList(SystemNoticeAdminRequest request, PageParamRequest pageParamRequest);
-}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemNoticeService.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemNoticeService.java
deleted file mode 100644
index d63b7ce2..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemNoticeService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zbkj.crmeb.system.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.system.model.SystemNotice;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.system.request.SystemNoticeRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description SystemNoticeService 接口
-* @since 2020-04-13
-*/
-public interface SystemNoticeService extends IService<SystemNotice> {
-    List<SystemNotice> getList(SystemNoticeRequest request, PageParamRequest pageParamRequest);
-}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemFileServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemFileServiceImpl.java
deleted file mode 100644
index 6b2b32ca..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemFileServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.zbkj.crmeb.system.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-import com.zbkj.crmeb.system.model.SystemFile;
-import com.zbkj.crmeb.system.dao.SystemFileDao;
-import com.zbkj.crmeb.system.request.SystemFileRequest;
-import com.zbkj.crmeb.system.service.SystemFileService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description SystemFileServiceImpl 接口实现
-* @since 2020-04-13
-*/
-@Service
-public class SystemFileServiceImpl extends ServiceImpl<SystemFileDao, SystemFile> implements SystemFileService {
-
-    @Resource
-    private SystemFileDao dao;
-
-
-    @Override
-    public List<SystemFile> getList(SystemFileRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        return dao.selectList(null);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemLogServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemLogServiceImpl.java
deleted file mode 100644
index 50b29613..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemLogServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.zbkj.crmeb.system.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-import com.zbkj.crmeb.system.model.SystemLog;
-import com.zbkj.crmeb.system.dao.SystemLogDao;
-import com.zbkj.crmeb.system.request.SystemLogRequest;
-import com.zbkj.crmeb.system.service.SystemLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description SystemLogServiceImpl 接口实现
-* @since 2020-04-13
-*/
-@Service
-public class SystemLogServiceImpl extends ServiceImpl<SystemLogDao, SystemLog> implements SystemLogService {
-
-    @Resource
-    private SystemLogDao dao;
-
-
-    @Override
-    public List<SystemLog> getList(SystemLogRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        return dao.selectList(null);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemNoticeAdminServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemNoticeAdminServiceImpl.java
deleted file mode 100644
index 1a9c08fd..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemNoticeAdminServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.zbkj.crmeb.system.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-import com.zbkj.crmeb.system.model.SystemNoticeAdmin;
-import com.zbkj.crmeb.system.dao.SystemNoticeAdminDao;
-import com.zbkj.crmeb.system.request.SystemNoticeAdminRequest;
-import com.zbkj.crmeb.system.service.SystemNoticeAdminService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description SystemNoticeAdminServiceImpl 接口实现
-* @since 2020-04-13
-*/
-@Service
-public class SystemNoticeAdminServiceImpl extends ServiceImpl<SystemNoticeAdminDao, SystemNoticeAdmin> implements SystemNoticeAdminService {
-
-    @Resource
-    private SystemNoticeAdminDao dao;
-
-
-    @Override
-    public List<SystemNoticeAdmin> getList(SystemNoticeAdminRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        return dao.selectList(null);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemNoticeServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemNoticeServiceImpl.java
deleted file mode 100644
index a2f22820..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemNoticeServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.zbkj.crmeb.system.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-import com.zbkj.crmeb.system.model.SystemNotice;
-import com.zbkj.crmeb.system.dao.SystemNoticeDao;
-import com.zbkj.crmeb.system.request.SystemNoticeRequest;
-import com.zbkj.crmeb.system.service.SystemNoticeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description SystemNoticeServiceImpl 接口实现
-* @since 2020-04-13
-*/
-@Service
-public class SystemNoticeServiceImpl extends ServiceImpl<SystemNoticeDao, SystemNotice> implements SystemNoticeService {
-
-    @Resource
-    private SystemNoticeDao dao;
-
-
-    @Override
-    public List<SystemNotice> getList(SystemNoticeRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        return dao.selectList(null);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/controller/RoutineAccessTokenController.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/controller/RoutineAccessTokenController.java
deleted file mode 100644
index 0832e809..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/controller/RoutineAccessTokenController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.zbkj.crmeb.wechat.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.wechat.request.RoutineAccessTokenRequest;
-import com.zbkj.crmeb.wechat.request.RoutineAccessTokenSearchRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.wechat.service.RoutineAccessTokenService;
-import com.zbkj.crmeb.wechat.model.RoutineAccessToken;
-
-
-/**
- * 小程序access_token表 前端控制器
- */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/routine/access/token")
-@Api(tags = "微信开放平台 -- 小程序access_token")
-public class RoutineAccessTokenController {
-
-    @Autowired
-    private RoutineAccessTokenService routineAccessTokenService;
-
-    /**
-     * 分页显示小程序access_token表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "分页列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<RoutineAccessToken>>  getList(@Validated RoutineAccessTokenSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<RoutineAccessToken> routineAccessTokenCommonPage = CommonPage.restPage(routineAccessTokenService.getList(request, pageParamRequest));
-        return CommonResult.success(routineAccessTokenCommonPage);
-    }
-
-    /**
-     * 新增小程序access_token表
-     * @param routineAccessTokenRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated RoutineAccessTokenRequest routineAccessTokenRequest){
-        RoutineAccessToken routineAccessToken = new RoutineAccessToken();
-        BeanUtils.copyProperties(routineAccessTokenRequest, routineAccessToken);
-
-        if(routineAccessTokenService.save(routineAccessToken)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除小程序access_token表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.GET)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(routineAccessTokenService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改小程序access_token表
-     * @param id integer id
-     * @param routineAccessTokenRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated RoutineAccessTokenRequest routineAccessTokenRequest){
-        RoutineAccessToken routineAccessToken = new RoutineAccessToken();
-        BeanUtils.copyProperties(routineAccessTokenRequest, routineAccessToken);
-        routineAccessToken.setId(id);
-
-        if(routineAccessTokenService.updateById(routineAccessToken)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询小程序access_token表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<RoutineAccessToken> info(@RequestParam(value = "id") Integer id){
-        RoutineAccessToken routineAccessToken = routineAccessTokenService.getById(id);
-        return CommonResult.success(routineAccessToken);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/controller/RoutineFormIdController.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/controller/RoutineFormIdController.java
deleted file mode 100644
index 411c4c5f..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/controller/RoutineFormIdController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.zbkj.crmeb.wechat.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.wechat.request.RoutineFormIdRequest;
-import com.zbkj.crmeb.wechat.request.RoutineFormIdSearchRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.wechat.service.RoutineFormIdService;
-import com.zbkj.crmeb.wechat.model.RoutineFormId;
-
-
-/**
- * 表单id表记录表 前端控制器
- */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/routine/form")
-@Api(tags = "微信开放平台 -- 表单id表记录")
-public class RoutineFormIdController {
-
-    @Autowired
-    private RoutineFormIdService routineFormIdService;
-
-    /**
-     * 分页显示表单id表记录表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "分页列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<RoutineFormId>>  getList(@Validated RoutineFormIdSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<RoutineFormId> routineFormIdCommonPage = CommonPage.restPage(routineFormIdService.getList(request, pageParamRequest));
-        return CommonResult.success(routineFormIdCommonPage);
-    }
-
-    /**
-     * 新增表单id表记录表
-     * @param routineFormIdRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated RoutineFormIdRequest routineFormIdRequest){
-        RoutineFormId routineFormId = new RoutineFormId();
-        BeanUtils.copyProperties(routineFormIdRequest, routineFormId);
-
-        if(routineFormIdService.save(routineFormId)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除表单id表记录表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.GET)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(routineFormIdService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改表单id表记录表
-     * @param id integer id
-     * @param routineFormIdRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated RoutineFormIdRequest routineFormIdRequest){
-        RoutineFormId routineFormId = new RoutineFormId();
-        BeanUtils.copyProperties(routineFormIdRequest, routineFormId);
-        routineFormId.setId(id);
-
-        if(routineFormIdService.updateById(routineFormId)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询表单id表记录表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<RoutineFormId> info(@RequestParam(value = "id") Integer id){
-        RoutineFormId routineFormId = routineFormIdService.getById(id);
-        return CommonResult.success(routineFormId);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/controller/RoutineQrcodeController.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/controller/RoutineQrcodeController.java
deleted file mode 100644
index 08c97724..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/controller/RoutineQrcodeController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.zbkj.crmeb.wechat.controller;
-
-import com.common.CommonPage;
-import com.common.CommonResult;
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.wechat.request.RoutineQrcodeRequest;
-import com.zbkj.crmeb.wechat.request.RoutineQrcodeSearchRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.wechat.service.RoutineQrcodeService;
-import com.zbkj.crmeb.wechat.model.RoutineQrcode;
-
-
-/**
- * 小程序二维码管理表 前端控制器
- */
-@Slf4j
-@RestController
-@RequestMapping("api/admin/wechat/routine/qrcode")
-@Api(tags = "微信开放平台 -- 小程序二维码管理")
-public class RoutineQrcodeController {
-
-    @Autowired
-    private RoutineQrcodeService routineQrcodeService;
-
-    /**
-     * 分页显示小程序二维码管理表
-     * @param request 搜索条件
-     * @param pageParamRequest 分页参数
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "分页列表")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public CommonResult<CommonPage<RoutineQrcode>>  getList(@Validated RoutineQrcodeSearchRequest request, @Validated PageParamRequest pageParamRequest){
-        CommonPage<RoutineQrcode> routineQrcodeCommonPage = CommonPage.restPage(routineQrcodeService.getList(request, pageParamRequest));
-        return CommonResult.success(routineQrcodeCommonPage);
-    }
-
-    /**
-     * 新增小程序二维码管理表
-     * @param routineQrcodeRequest 新增参数
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CommonResult<String> save(@Validated RoutineQrcodeRequest routineQrcodeRequest){
-        RoutineQrcode routineQrcode = new RoutineQrcode();
-        BeanUtils.copyProperties(routineQrcodeRequest, routineQrcode);
-
-        if(routineQrcodeService.save(routineQrcode)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 删除小程序二维码管理表
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/delete", method = RequestMethod.GET)
-    public CommonResult<String> delete(@RequestParam(value = "id") Integer id){
-        if(routineQrcodeService.removeById(id)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 修改小程序二维码管理表
-     * @param id integer id
-     * @param routineQrcodeRequest 修改参数
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "修改")
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public CommonResult<String> update(@RequestParam Integer id, @Validated RoutineQrcodeRequest routineQrcodeRequest){
-        RoutineQrcode routineQrcode = new RoutineQrcode();
-        BeanUtils.copyProperties(routineQrcodeRequest, routineQrcode);
-        routineQrcode.setId(id);
-
-        if(routineQrcodeService.updateById(routineQrcode)){
-            return CommonResult.success();
-        }else{
-            return CommonResult.failed();
-        }
-    }
-
-    /**
-     * 查询小程序二维码管理表信息
-     * @param id Integer
-     * @author Mr.Zhang
-     * @since 2020-04-18
-     */
-    @ApiOperation(value = "详情")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public CommonResult<RoutineQrcode> info(@RequestParam(value = "id") Integer id){
-        RoutineQrcode routineQrcode = routineQrcodeService.getById(id);
-        return CommonResult.success(routineQrcode);
-   }
-}
-
-
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/dao/RoutineAccessTokenDao.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/dao/RoutineAccessTokenDao.java
deleted file mode 100644
index 16bd6938..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/dao/RoutineAccessTokenDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.wechat.dao;
-
-import com.zbkj.crmeb.wechat.model.RoutineAccessToken;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 小程序access_token表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-public interface RoutineAccessTokenDao extends BaseMapper<RoutineAccessToken> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/dao/RoutineFormIdDao.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/dao/RoutineFormIdDao.java
deleted file mode 100644
index 862b7c8f..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/dao/RoutineFormIdDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.wechat.dao;
-
-import com.zbkj.crmeb.wechat.model.RoutineFormId;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 表单id表记录表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-public interface RoutineFormIdDao extends BaseMapper<RoutineFormId> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/dao/RoutineQrcodeDao.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/dao/RoutineQrcodeDao.java
deleted file mode 100644
index 40be36e8..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/dao/RoutineQrcodeDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zbkj.crmeb.wechat.dao;
-
-import com.zbkj.crmeb.wechat.model.RoutineQrcode;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 小程序二维码管理表 Mapper 接口
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-public interface RoutineQrcodeDao extends BaseMapper<RoutineQrcode> {
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/model/RoutineAccessToken.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/model/RoutineAccessToken.java
deleted file mode 100644
index 95362164..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/model/RoutineAccessToken.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.zbkj.crmeb.wechat.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 小程序access_token表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_routine_access_token")
-@ApiModel(value="RoutineAccessToken对象", description="小程序access_token表")
-public class RoutineAccessToken implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "小程序access_token表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "openid")
-    private String accessToken;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/model/RoutineFormId.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/model/RoutineFormId.java
deleted file mode 100644
index ab710d7a..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/model/RoutineFormId.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.zbkj.crmeb.wechat.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 表单id表记录表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_routine_form_id")
-@ApiModel(value="RoutineFormId对象", description="表单id表记录表")
-public class RoutineFormId implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "表单ID表ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户uid")
-    private Integer uid;
-
-    @ApiModelProperty(value = "表单ID")
-    private String formId;
-
-    @ApiModelProperty(value = "表单ID失效时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "状态1 未使用 2不能使用")
-    private Boolean status;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/model/RoutineQrcode.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/model/RoutineQrcode.java
deleted file mode 100644
index 60d21ef7..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/model/RoutineQrcode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zbkj.crmeb.wechat.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 小程序二维码管理表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_routine_qrcode")
-@ApiModel(value="RoutineQrcode对象", description="小程序二维码管理表")
-public class RoutineQrcode implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "微信二维码ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "二维码类型 spread(用户推广) product_spread(商品推广)")
-    private String thirdType;
-
-    @ApiModelProperty(value = "用户id")
-    private Integer thirdId;
-
-    @ApiModelProperty(value = "状态 0不可用 1可用")
-    private Boolean status;
-
-    @ApiModelProperty(value = "添加时间")
-    private String addTime;
-
-    @ApiModelProperty(value = "小程序页面路径带参数")
-    private String page;
-
-    @ApiModelProperty(value = "小程序二维码路径")
-    private String qrcodeUrl;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineAccessTokenRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineAccessTokenRequest.java
deleted file mode 100644
index e1d6fcdf..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineAccessTokenRequest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.zbkj.crmeb.wechat.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 小程序access_token表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_routine_access_token")
-@ApiModel(value="RoutineAccessToken对象", description="小程序access_token表")
-public class RoutineAccessTokenRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "openid")
-    private String accessToken;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer stopTime;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineAccessTokenSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineAccessTokenSearchRequest.java
deleted file mode 100644
index 86e28ee1..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineAccessTokenSearchRequest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.zbkj.crmeb.wechat.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 小程序access_token表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_routine_access_token")
-@ApiModel(value="RoutineAccessToken对象", description="小程序access_token表")
-public class RoutineAccessTokenSearchRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "openid")
-    private String accessToken;
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineFormIdRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineFormIdRequest.java
deleted file mode 100644
index f2e770fb..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineFormIdRequest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.zbkj.crmeb.wechat.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 表单id表记录表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_routine_form_id")
-@ApiModel(value="RoutineFormId对象", description="表单id表记录表")
-public class RoutineFormIdRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "用户uid")
-    private Integer uid;
-
-    @ApiModelProperty(value = "表单ID")
-    private String formId;
-
-    @ApiModelProperty(value = "表单ID失效时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "状态1 未使用 2不能使用")
-    private Boolean status;
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineFormIdSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineFormIdSearchRequest.java
deleted file mode 100644
index 89d7ce4d..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineFormIdSearchRequest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.zbkj.crmeb.wechat.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 表单id表记录表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_routine_form_id")
-@ApiModel(value="RoutineFormId对象", description="表单id表记录表")
-public class RoutineFormIdSearchRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "用户uid")
-    private Integer uid;
-
-    @ApiModelProperty(value = "表单ID")
-    private String formId;
-
-    @ApiModelProperty(value = "表单ID失效时间")
-    private Integer stopTime;
-
-    @ApiModelProperty(value = "状态1 未使用 2不能使用")
-    private Boolean status;
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineQrcodeRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineQrcodeRequest.java
deleted file mode 100644
index c38fb1f1..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineQrcodeRequest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.zbkj.crmeb.wechat.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 小程序二维码管理表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_routine_qrcode")
-@ApiModel(value="RoutineQrcode对象", description="小程序二维码管理表")
-public class RoutineQrcodeRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "二维码类型 spread(用户推广) product_spread(商品推广)")
-    private String thirdType;
-
-    @ApiModelProperty(value = "用户id")
-    private Integer thirdId;
-
-    @ApiModelProperty(value = "状态 0不可用 1可用")
-    private Boolean status;
-
-    @ApiModelProperty(value = "小程序页面路径带参数")
-    private String page;
-
-    @ApiModelProperty(value = "小程序二维码路径")
-    private String qrcodeUrl;
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineQrcodeSearchRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineQrcodeSearchRequest.java
deleted file mode 100644
index 6a0188d8..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/request/RoutineQrcodeSearchRequest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.zbkj.crmeb.wechat.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 小程序二维码管理表
- * </p>
- *
- * @author Mr.Zhang
- * @since 2020-04-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_routine_qrcode")
-@ApiModel(value="RoutineQrcode对象", description="小程序二维码管理表")
-public class RoutineQrcodeSearchRequest implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "微信二维码ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "二维码类型 spread(用户推广) product_spread(商品推广)")
-    private String thirdType;
-
-    @ApiModelProperty(value = "用户id")
-    private Integer thirdId;
-
-    @ApiModelProperty(value = "状态 0不可用 1可用")
-    private Boolean status;
-
-    @ApiModelProperty(value = "添加时间")
-    private String addTime;
-
-    @ApiModelProperty(value = "小程序页面路径带参数")
-    private String page;
-
-    @ApiModelProperty(value = "小程序二维码路径")
-    private String qrcodeUrl;
-
-
-
-}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/RoutineAccessTokenService.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/RoutineAccessTokenService.java
deleted file mode 100644
index d39ade42..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/RoutineAccessTokenService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zbkj.crmeb.wechat.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.wechat.model.RoutineAccessToken;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.wechat.request.RoutineAccessTokenSearchRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description RoutineAccessTokenService 接口
-* @since 2020-04-18
-*/
-public interface RoutineAccessTokenService extends IService<RoutineAccessToken> {
-
-    List<RoutineAccessToken> getList(RoutineAccessTokenSearchRequest request, PageParamRequest pageParamRequest);
-}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/RoutineFormIdService.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/RoutineFormIdService.java
deleted file mode 100644
index 38f2732e..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/RoutineFormIdService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zbkj.crmeb.wechat.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.wechat.model.RoutineFormId;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.wechat.request.RoutineFormIdSearchRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description RoutineFormIdService 接口
-* @since 2020-04-18
-*/
-public interface RoutineFormIdService extends IService<RoutineFormId> {
-
-    List<RoutineFormId> getList(RoutineFormIdSearchRequest request, PageParamRequest pageParamRequest);
-}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/RoutineQrcodeService.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/RoutineQrcodeService.java
deleted file mode 100644
index a6495ecb..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/RoutineQrcodeService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zbkj.crmeb.wechat.service;
-
-import com.common.PageParamRequest;
-import com.zbkj.crmeb.wechat.model.RoutineQrcode;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zbkj.crmeb.wechat.request.RoutineQrcodeSearchRequest;
-
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description RoutineQrcodeService 接口
-* @since 2020-04-18
-*/
-public interface RoutineQrcodeService extends IService<RoutineQrcode> {
-
-    List<RoutineQrcode> getList(RoutineQrcodeSearchRequest request, PageParamRequest pageParamRequest);
-}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/impl/RoutineAccessTokenServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/impl/RoutineAccessTokenServiceImpl.java
deleted file mode 100644
index 9974327b..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/impl/RoutineAccessTokenServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.zbkj.crmeb.wechat.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-import com.utils.CrmebUtil;
-
-import com.zbkj.crmeb.wechat.model.RoutineAccessToken;
-import com.zbkj.crmeb.wechat.dao.RoutineAccessTokenDao;
-import com.zbkj.crmeb.wechat.request.RoutineAccessTokenSearchRequest;
-import com.zbkj.crmeb.wechat.service.RoutineAccessTokenService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description RoutineAccessTokenServiceImpl 接口实现
-* @since 2020-04-18
-*/
-@Service
-public class RoutineAccessTokenServiceImpl extends ServiceImpl<RoutineAccessTokenDao, RoutineAccessToken> implements RoutineAccessTokenService {
-
-    @Resource
-    private RoutineAccessTokenDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-04-18
-    * @return List<RoutineAccessToken>
-    */
-    @Override
-    public List<RoutineAccessToken> getList(RoutineAccessTokenSearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        return dao.selectList(null);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/impl/RoutineFormIdServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/impl/RoutineFormIdServiceImpl.java
deleted file mode 100644
index 4d74c391..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/impl/RoutineFormIdServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.zbkj.crmeb.wechat.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-import com.utils.CrmebUtil;
-
-import com.zbkj.crmeb.wechat.model.RoutineFormId;
-import com.zbkj.crmeb.wechat.dao.RoutineFormIdDao;
-import com.zbkj.crmeb.wechat.request.RoutineFormIdSearchRequest;
-import com.zbkj.crmeb.wechat.service.RoutineFormIdService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description RoutineFormIdServiceImpl 接口实现
-* @since 2020-04-18
-*/
-@Service
-public class RoutineFormIdServiceImpl extends ServiceImpl<RoutineFormIdDao, RoutineFormId> implements RoutineFormIdService {
-
-    @Resource
-    private RoutineFormIdDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-04-18
-    * @return List<RoutineFormId>
-    */
-    @Override
-    public List<RoutineFormId> getList(RoutineFormIdSearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        return dao.selectList(null);
-    }
-
-}
-
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/impl/RoutineQrcodeServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/impl/RoutineQrcodeServiceImpl.java
deleted file mode 100644
index 00b0d0b2..00000000
--- a/crmeb/src/main/java/com/zbkj/crmeb/wechat/service/impl/RoutineQrcodeServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.zbkj.crmeb.wechat.service.impl;
-
-import com.common.PageParamRequest;
-import com.github.pagehelper.PageHelper;
-import com.utils.CrmebUtil;
-
-import com.zbkj.crmeb.wechat.model.RoutineQrcode;
-import com.zbkj.crmeb.wechat.dao.RoutineQrcodeDao;
-import com.zbkj.crmeb.wechat.request.RoutineQrcodeSearchRequest;
-import com.zbkj.crmeb.wechat.service.RoutineQrcodeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
-* @author Mr.Zhang
-* @Description RoutineQrcodeServiceImpl 接口实现
-* @since 2020-04-18
-*/
-@Service
-public class RoutineQrcodeServiceImpl extends ServiceImpl<RoutineQrcodeDao, RoutineQrcode> implements RoutineQrcodeService {
-
-    @Resource
-    private RoutineQrcodeDao dao;
-
-
-    /**
-    * 列表
-    * @param request 请求参数
-    * @param pageParamRequest 分页类参数
-    * @author Mr.Zhang
-    * @since 2020-04-18
-    * @return List<RoutineQrcode>
-    */
-    @Override
-    public List<RoutineQrcode> getList(RoutineQrcodeSearchRequest request, PageParamRequest pageParamRequest) {
-        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        return dao.selectList(null);
-    }
-
-}
-
diff --git a/crmeb/src/main/resources/templates/controller.java.vm b/crmeb/src/main/resources/templates/controller.java.vm
deleted file mode 100644
index 2a0e7052..00000000
--- a/crmeb/src/main/resources/templates/controller.java.vm
+++ /dev/null
@@ -1,114 +0,0 @@
-package ${package.Controller};
-
-
-import com.qizhi.itfin.common.util.PageUtils;
-import com.qizhi.itfin.common.util.R;
-import com.qizhi.itfin.entity.${table.entityName};
-import com.qizhi.itfin.service.${table.serviceName};
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.plugins.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.Map;
-/**
- * $!{table.comment} 前端控制器
- */
-@Slf4j
-@RestController
-@RequestMapping("#if(${package.ModuleName})/${package.ModuleName}#end/#if(${controllerMappingHyphenStyle})${controllerMappingHyphen}#else${table.entityPath}#end")
-#if(${kotlin})
-
-class ${table.controllerName}#if(${superControllerClass}):${superControllerClass}()#end
-
-#else
-    #if(${superControllerClass})
-
-    public class ${table.controllerName}
-} extends ${superControllerClass}{
-    #else
-
-    public class ${table.controllerName} {
-    #end
-
-    #set($serviceImplName=$table.serviceName.substring(0,1).toLowerCase()+$table.serviceName.substring(1))
-    #set($entityName=$table.entityName.substring(0,1).toLowerCase()+$table.entityName.substring(1))
-@Autowired
-private ${table.serviceName} ${serviceImplName};
-
-/**
- * 分页显示$!{table.comment}
- *
- * @param currentPage 当前页
- * @param pageSize 每页大小
- * @param sortFields 排序字段
- * @param orderTypes asc/desc
- */
-@RequestMapping("/page")
-public R page(Integer currentPage,Integer pageSize,String sortField,String orderType,
-    ${table.entityName}${entityName}){
-            Page<${table.entityName}>page=PageUtils.getPage(currentPage,pageSize,sortField,orderType);
-            PageResult pageResult=odrProductFromService.page(page,${entityName});
-            return R.ok().put("page",pageResult);
-        }
-
-/**
- * 新增${table.comment}
- */
-@RequestMapping("/save")
-public R save(${table.entityName}${entityName}){
-        if(${serviceImplName}.save(${entityName})){
-            return R.ok();
-        }else{
-            return R.error("添加失败!");
-        }
-    }
-
-/**
- * 删除${table.comment}
- */
-@RequestMapping("/delete")
-public R delete(Integer id){
-        if(${serviceImplName}.removeById(id)){
-            return R.ok();
-        }else{
-            return R.error("删除失败!");
-        }
-    }
-
-/**
- * 修改${table.comment}
- */
-@RequestMapping("/update")
-public R update(${table.entityName}${entityName},BindingResult result){
-        if(${serviceImplName}.updateById(${entityName})){
-            return R.ok();
-        }else{
-            return R.error("修改失败!");
-        }
-    }
-
-/**
- * 查询${table.comment}信息
- *
- * @param id id
- */
-@RequestMapping("/info")
-public R info(Integer id){
-    ${table.entityName}${entityName}=service.getById(id);
-        return R.ok().put("data",${entityName});
-        }
-    }
-
-
-#end
-
diff --git a/crmeb/src/main/resources/templates/mapper.vm b/crmeb/src/main/resources/templates/mapper.vm
deleted file mode 100644
index 2ba67e7f..00000000
--- a/crmeb/src/main/resources/templates/mapper.vm
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-
-<mapper namespace="$daoPackage">
-
-    <resultMap  id="BaseResultMap" type="$domainPackage.$domainClass">
-#foreach($resultMap in $resultMapList)
-        <result column="$resultMap.dbColumn" property="$resultMap.javaField"/>
-#end
-    </resultMap>
-
-    <sql id="Base_Column_List">#foreach($resultMap in $resultMapList)#set($dbsaveAttr= $resultMap.dbColumn)#if($velocityCount != 1), #end$dbsaveAttr#end</sql>
-
-    <sql id="Base_Column_List_Without_Id">#foreach($resultMap in $resultMapList)#if($resultMap.dbColumn =='id')#else#set($dbsaveAttr= $resultMap.dbColumn)#if($velocityCount != 2), #end$dbsaveAttr#end#end</sql>
-
-</mapper>
diff --git a/crmeb/src/test/java/com/zbkj/crmeb/store/service/impl/StoreProductRelationServiceImplTest.java b/crmeb/src/test/java/com/zbkj/crmeb/store/service/impl/StoreProductRelationServiceImplTest.java
deleted file mode 100644
index 2036cc2f..00000000
--- a/crmeb/src/test/java/com/zbkj/crmeb/store/service/impl/StoreProductRelationServiceImplTest.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-class StoreProductRelationServiceImplTest {
-
-}
diff --git a/crmeb/src/test/java/com/zbkj/crmeb/store/service/impl/StoreProductReplyServiceImplTest.java b/crmeb/src/test/java/com/zbkj/crmeb/store/service/impl/StoreProductReplyServiceImplTest.java
deleted file mode 100644
index 37c7fe2c..00000000
--- a/crmeb/src/test/java/com/zbkj/crmeb/store/service/impl/StoreProductReplyServiceImplTest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.zbkj.crmeb.store.service.impl;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class StoreProductReplyServiceImplTest {
-
-}
\ No newline at end of file
diff --git a/crmeb/src/test/java/com/zbkj/crmeb/user/service/impl/UserServiceImplTest.java b/crmeb/src/test/java/com/zbkj/crmeb/user/service/impl/UserServiceImplTest.java
deleted file mode 100644
index 030f7a05..00000000
--- a/crmeb/src/test/java/com/zbkj/crmeb/user/service/impl/UserServiceImplTest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.zbkj.crmeb.user.service.impl;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class UserServiceImplTest {
-
-}
\ No newline at end of file