diff --git a/work-common/src/main/java/com/bwie/common/domain/Customer.java b/work-common/src/main/java/com/bwie/common/domain/Customer.java
new file mode 100644
index 0000000..ca0a548
--- /dev/null
+++ b/work-common/src/main/java/com/bwie/common/domain/Customer.java
@@ -0,0 +1,53 @@
+package com.bwie.common.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @ProjectName: GG-market
+ * @PackageName: com.bwie.common.domain
+ * @Description TODO 客户
+ * @Author LiYonJie
+ * @Date 2023/11/20
+ * @Version 1.0
+ */
+@Data
+public class Customer {
+    /**
+     * 客户编号
+     */
+    private Integer customerId;
+    /**
+     * 客户姓名
+     */
+    private String customerName;
+    /**
+     * 客户年龄
+     */
+    private Integer customerAge;
+    /**
+     * 客户性别:1-男 2-女
+     */
+    private Integer customerGender;
+    /**
+     * 客户住址
+     */
+    private String customerAddress;
+    /**
+     * 客户联系方式
+     */
+    private String customerTel;
+    /**
+     * 会员等级
+     */
+    private Integer vipGrade;
+    /**
+     * 会员注册日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date regDate;
+}
diff --git a/work-common/src/main/java/com/bwie/common/domain/Merch.java b/work-common/src/main/java/com/bwie/common/domain/Merch.java
new file mode 100644
index 0000000..a755765
--- /dev/null
+++ b/work-common/src/main/java/com/bwie/common/domain/Merch.java
@@ -0,0 +1,67 @@
+package com.bwie.common.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ProjectName: GG-market
+ * @PackageName: com.bwie.common.domain
+ * @Description TODO 商品
+ * @Author LiYonJie
+ * @Date 2023/11/19
+ * @Version 1.0
+ */
+@Data
+public class Merch implements Serializable {
+    /**
+     * 商品编号
+     */
+    private Integer merchId;
+    /**
+     * 商品名称
+     */
+    private String merchName;
+    /**
+     * 商品类型
+     */
+    private Integer merchType;
+    /**
+     * 价格
+     */
+    private BigDecimal merchPrice;
+    /**
+     * 条形码
+     */
+    private String barCode;
+    /**
+     * 促销价
+     */
+    private BigDecimal salesProPrice;
+    /**
+     * 厂商编号
+     */
+    private String factoryId;
+    /**
+     * 供货商编号
+     */
+    private String provideId;
+    /**
+     * 过期日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date merchDeadTime;
+    /**
+     * 库存数量
+     */
+    private Integer merchNum;
+    /**
+     * 商品状态:1-未上架 2-上架 3-下架
+     */
+    private Integer merchSta;
+}
diff --git a/work-common/src/main/java/com/bwie/common/domain/Type.java b/work-common/src/main/java/com/bwie/common/domain/Type.java
new file mode 100644
index 0000000..6ce6724
--- /dev/null
+++ b/work-common/src/main/java/com/bwie/common/domain/Type.java
@@ -0,0 +1,27 @@
+package com.bwie.common.domain;
+
+import lombok.Data;
+
+/**
+ * @ProjectName: GG-market
+ * @PackageName: com.bwie.common.domain
+ * @Description TODO 类型
+ * @Author LiYonJie
+ * @Date 2023/11/20
+ * @Version 1.0
+ */
+@Data
+public class Type {
+    /**
+     * 类型Id
+     */
+    private Integer typeId;
+    /**
+     * 类型名称
+     */
+    private String typeName;
+    /**
+     * 父级Id
+     */
+    private Integer categoryId;
+}
diff --git a/work-common/src/main/java/com/bwie/common/domain/request/MerchRequest.java b/work-common/src/main/java/com/bwie/common/domain/request/MerchRequest.java
new file mode 100644
index 0000000..9c149aa
--- /dev/null
+++ b/work-common/src/main/java/com/bwie/common/domain/request/MerchRequest.java
@@ -0,0 +1,31 @@
+package com.bwie.common.domain.request;
+
+import lombok.Data;
+
+/**
+ * @ProjectName: GG-market
+ * @PackageName: com.bwie.common.domain.request
+ * @Description TODO 商品查询
+ * @Author LiYonJie
+ * @Date 2023/11/19
+ * @Version 1.0
+ */
+@Data
+public class MerchRequest {
+
+    /**
+     * 商品编号
+     */
+    private Integer merchId;
+    /**
+     * 商品名称
+     */
+    private String merchName;
+    /**
+     * 商品类型
+     */
+    private Integer merchType;
+
+    private Integer pageNum = 1;
+    private Integer pageSize = 5;
+}
diff --git a/work-common/src/main/java/com/bwie/common/domain/response/MerchResponse.java b/work-common/src/main/java/com/bwie/common/domain/response/MerchResponse.java
new file mode 100644
index 0000000..cbec25e
--- /dev/null
+++ b/work-common/src/main/java/com/bwie/common/domain/response/MerchResponse.java
@@ -0,0 +1,20 @@
+package com.bwie.common.domain.response;
+
+import com.bwie.common.domain.Merch;
+import lombok.Data;
+
+/**
+ * @ProjectName: GG-market
+ * @PackageName: com.bwie.common.domain.response
+ * @Description TODO 商品响应
+ * @Author LiYonJie
+ * @Date 2023/11/19
+ * @Version 1.0
+ */
+@Data
+public class MerchResponse extends Merch {
+    /**
+     * 类型名称
+     */
+    private String typeName;
+}
diff --git a/work-modules/work-manage/src/main/java/com/bwie/manage/controller/ManageController.java b/work-modules/work-manage/src/main/java/com/bwie/manage/controller/ManageController.java
index 2a8a915..4d418ec 100644
--- a/work-modules/work-manage/src/main/java/com/bwie/manage/controller/ManageController.java
+++ b/work-modules/work-manage/src/main/java/com/bwie/manage/controller/ManageController.java
@@ -24,8 +24,13 @@ public class ManageController {
     private ManagerService managerService;
 
     @PostMapping("/listManager")
-    public Result<PageResult<EmpResponse>> list(@RequestBody EmpRequest empRequest){
-        return managerService.list(empRequest);
+    public Result<PageResult<EmpResponse>> listManager(@RequestBody EmpRequest empRequest){
+        return managerService.listManager(empRequest);
+    }
+
+    @PostMapping("/listEmp")
+    public Result<PageResult<EmpResponse>> listEmp(@RequestBody EmpRequest empRequest){
+        return managerService.listEmp(empRequest);
     }
 
     @PostMapping("/add")
diff --git a/work-modules/work-manage/src/main/java/com/bwie/manage/controller/MerchController.java b/work-modules/work-manage/src/main/java/com/bwie/manage/controller/MerchController.java
new file mode 100644
index 0000000..a5d58cb
--- /dev/null
+++ b/work-modules/work-manage/src/main/java/com/bwie/manage/controller/MerchController.java
@@ -0,0 +1,61 @@
+package com.bwie.manage.controller;
+
+import com.bwie.common.domain.Merch;
+import com.bwie.common.domain.request.MerchRequest;
+import com.bwie.common.domain.response.MerchResponse;
+import com.bwie.common.result.PageResult;
+import com.bwie.common.result.Result;
+import com.bwie.manage.service.MerchService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @ProjectName: GG-market
+ * @PackageName: com.bwie.manage.controller
+ * @Description TODO
+ * @Author LiYonJie
+ * @Date 2023/11/19
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/merch")
+public class MerchController {
+
+    @Autowired
+    private MerchService merchService;
+
+    @PostMapping("/listMerch")
+    public Result<PageResult<MerchResponse>> list(@RequestBody MerchRequest merchRequest){
+        return merchService.list(merchRequest);
+    }
+
+    @PostMapping("/addMerch")
+    public Result add(@RequestBody Merch merch){
+        merchService.add(merch);
+        return Result.success();
+    }
+
+    @GetMapping("/findByMerchId/{merchId}")
+    public Result findById(@PathVariable("merchId") Integer merchId){
+        Merch merch = merchService.findById(merchId);
+        return Result.success(merch);
+    }
+
+    @PutMapping("/updateMerch")
+    public Result update(@RequestBody Merch merch){
+        merchService.update(merch);
+        return Result.success();
+    }
+
+    @DeleteMapping("/delMerch/{merchId}")
+    public Result del(@PathVariable("merchId") Integer merchId){
+        merchService.del(merchId);
+        return Result.success();
+    }
+
+    @DeleteMapping("/batchDelMerch/{merchIds}")
+    public Result batchDel(@PathVariable("merchIds") Integer[] merchIds){
+        merchService.batchDel(merchIds);
+        return Result.success();
+    }
+}
diff --git a/work-modules/work-manage/src/main/java/com/bwie/manage/mapper/ManagerMapper.java b/work-modules/work-manage/src/main/java/com/bwie/manage/mapper/ManagerMapper.java
index c81495b..9adde07 100644
--- a/work-modules/work-manage/src/main/java/com/bwie/manage/mapper/ManagerMapper.java
+++ b/work-modules/work-manage/src/main/java/com/bwie/manage/mapper/ManagerMapper.java
@@ -23,35 +23,43 @@ public interface ManagerMapper {
      * @param empRequest
      * @return
      */
-    List<EmpResponse> list(EmpRequest empRequest);
+    List<EmpResponse> listManager(EmpRequest empRequest);
+
 
     /**
-     * 添加管理员
+     * 员工列表
+     * @param empRequest
+     * @return
+     */
+    List<EmpResponse> listEmp(EmpRequest empRequest);
+
+    /**
+     * 添加管理员/员工
      * @param emp
      */
     void add(Emp emp);
 
     /**
-     * 管理员回显
+     * 管理员/员工回显
      * @param empId
      * @return
      */
     EmpResponse findById(@Param("empId") Integer empId);
 
     /**
-     * 编辑管理员
+     * 编辑管理员/员工
      * @param emp
      */
     void update(Emp emp);
 
     /**
-     * 删除管理员
+     * 删除管理员/员工
      * @param empId
      */
     void del(@Param("empId") Integer empId);
 
     /**
-     * 批量删除管理员
+     * 批量删除管理员/员工
      * @param empIds
      */
     void batchDel(@Param("empIds") Integer[] empIds);
diff --git a/work-modules/work-manage/src/main/java/com/bwie/manage/mapper/MerchMapper.java b/work-modules/work-manage/src/main/java/com/bwie/manage/mapper/MerchMapper.java
new file mode 100644
index 0000000..738b1ff
--- /dev/null
+++ b/work-modules/work-manage/src/main/java/com/bwie/manage/mapper/MerchMapper.java
@@ -0,0 +1,58 @@
+package com.bwie.manage.mapper;
+
+import com.bwie.common.domain.Merch;
+import com.bwie.common.domain.request.MerchRequest;
+import com.bwie.common.domain.response.MerchResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @ProjectName: GG-market
+ * @PackageName: com.bwie.manage.mapper
+ * @Description TODO
+ * @Author LiYonJie
+ * @Date 2023/11/20
+ * @Version 1.0
+ */
+@Mapper
+public interface MerchMapper {
+    /**
+     * 商品列表
+     * @param merchRequest
+     * @return
+     */
+    List<MerchResponse> list(MerchRequest merchRequest);
+
+    /**
+     * 添加商品
+     * @param merch
+     */
+    void add(Merch merch);
+
+    /**
+     * 查询商品
+     * @param merchId
+     * @return
+     */
+    Merch findById(@Param("merchId") Integer merchId);
+
+    /**
+     * 修改商品
+     * @param merch
+     */
+    void update(Merch merch);
+
+    /**
+     * 删除商品
+     * @param merchId
+     */
+    void del(@Param("merchId") Integer merchId);
+
+    /**
+     * 删除选中商品
+     * @param merchIds
+     */
+    void batchDel(@Param("merchIds") Integer[] merchIds);
+}
diff --git a/work-modules/work-manage/src/main/java/com/bwie/manage/service/ManagerService.java b/work-modules/work-manage/src/main/java/com/bwie/manage/service/ManagerService.java
index 3404aa3..b7b31fa 100644
--- a/work-modules/work-manage/src/main/java/com/bwie/manage/service/ManagerService.java
+++ b/work-modules/work-manage/src/main/java/com/bwie/manage/service/ManagerService.java
@@ -15,11 +15,18 @@ import com.bwie.common.result.Result;
  */
 public interface ManagerService {
     /**
-     * 管理员列表
+     * 管理员分页列表
      * @param empRequest
      * @return
      */
-    Result<PageResult<EmpResponse>> list(EmpRequest empRequest);
+    Result<PageResult<EmpResponse>> listManager(EmpRequest empRequest);
+
+    /**
+     * 员工分页列表
+     * @param empRequest
+     * @return
+     */
+    Result<PageResult<EmpResponse>> listEmp(EmpRequest empRequest);
 
     /**
      * 添加管理员
diff --git a/work-modules/work-manage/src/main/java/com/bwie/manage/service/MerchService.java b/work-modules/work-manage/src/main/java/com/bwie/manage/service/MerchService.java
new file mode 100644
index 0000000..85a86a7
--- /dev/null
+++ b/work-modules/work-manage/src/main/java/com/bwie/manage/service/MerchService.java
@@ -0,0 +1,55 @@
+package com.bwie.manage.service;
+
+import com.bwie.common.domain.Merch;
+import com.bwie.common.domain.request.MerchRequest;
+import com.bwie.common.domain.response.MerchResponse;
+import com.bwie.common.result.PageResult;
+import com.bwie.common.result.Result;
+
+/**
+ * @ProjectName: GG-market
+ * @PackageName: com.bwie.manage.service
+ * @Description TODO
+ * @Author LiYonJie
+ * @Date 2023/11/19
+ * @Version 1.0
+ */
+public interface MerchService {
+    /**
+     * 商品分页列表
+     * @param merchRequest
+     * @return
+     */
+    Result<PageResult<MerchResponse>> list(MerchRequest merchRequest);
+
+    /**
+     * 添加商品
+     * @param merch
+     */
+    void add(Merch merch);
+
+    /**
+     * 查询商品
+     * @param merchId
+     * @return
+     */
+    Merch findById(Integer merchId);
+
+    /**
+     * 修改商品
+     * @param merch
+     */
+    void update(Merch merch);
+
+    /**
+     * 删除商品
+     * @param merchId
+     */
+    void del(Integer merchId);
+
+    /**
+     * 删除选中商品
+     * @param merchIds
+     */
+    void batchDel(Integer[] merchIds);
+}
diff --git a/work-modules/work-manage/src/main/java/com/bwie/manage/service/impl/ManagerServiceImpl.java b/work-modules/work-manage/src/main/java/com/bwie/manage/service/impl/ManagerServiceImpl.java
index 7ba77ba..fcd137d 100644
--- a/work-modules/work-manage/src/main/java/com/bwie/manage/service/impl/ManagerServiceImpl.java
+++ b/work-modules/work-manage/src/main/java/com/bwie/manage/service/impl/ManagerServiceImpl.java
@@ -34,9 +34,17 @@ public class ManagerServiceImpl implements ManagerService {
     private RoleService roleService;
 
     @Override
-    public Result<PageResult<EmpResponse>> list(EmpRequest empRequest) {
+    public Result<PageResult<EmpResponse>> listManager(EmpRequest empRequest) {
         PageHelper.startPage(empRequest.getPageNum(),empRequest.getPageSize());
-        List<EmpResponse> list = managerMapper.list(empRequest);
+        List<EmpResponse> list = managerMapper.listManager(empRequest);
+        PageInfo<EmpResponse> info = new PageInfo<>(list);
+        return PageResult.toResult(info.getTotal(), list);
+    }
+
+    @Override
+    public Result<PageResult<EmpResponse>> listEmp(EmpRequest empRequest) {
+        PageHelper.startPage(empRequest.getPageNum(),empRequest.getPageSize());
+        List<EmpResponse> list = managerMapper.listEmp(empRequest);
         PageInfo<EmpResponse> info = new PageInfo<>(list);
         return PageResult.toResult(info.getTotal(), list);
     }
diff --git a/work-modules/work-manage/src/main/java/com/bwie/manage/service/impl/MerchServiceImpl.java b/work-modules/work-manage/src/main/java/com/bwie/manage/service/impl/MerchServiceImpl.java
new file mode 100644
index 0000000..6bdb8e3
--- /dev/null
+++ b/work-modules/work-manage/src/main/java/com/bwie/manage/service/impl/MerchServiceImpl.java
@@ -0,0 +1,63 @@
+package com.bwie.manage.service.impl;
+
+import com.bwie.common.domain.Merch;
+import com.bwie.common.domain.request.MerchRequest;
+import com.bwie.common.domain.response.MerchResponse;
+import com.bwie.common.result.PageResult;
+import com.bwie.common.result.Result;
+import com.bwie.manage.mapper.MerchMapper;
+import com.bwie.manage.service.MerchService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @ProjectName: GG-market
+ * @PackageName: com.bwie.manage.service.impl
+ * @Description TODO
+ * @Author LiYonJie
+ * @Date 2023/11/19
+ * @Version 1.0
+ */
+@Service
+public class MerchServiceImpl implements MerchService {
+
+    @Autowired
+    private MerchMapper merchMapper;
+
+    @Override
+    public Result<PageResult<MerchResponse>> list(MerchRequest merchRequest) {
+        PageHelper.startPage(merchRequest.getPageNum(), merchRequest.getPageSize());
+        List<MerchResponse> list = merchMapper.list(merchRequest);
+        PageInfo<MerchResponse> info = new PageInfo<>(list);
+        return PageResult.toResult(info.getTotal(), list);
+    }
+
+    @Override
+    public void add(Merch merch) {
+        merchMapper.add(merch);
+    }
+
+    @Override
+    public Merch findById(Integer merchId) {
+        return merchMapper.findById(merchId);
+    }
+
+    @Override
+    public void update(Merch merch) {
+        merchMapper.update(merch);
+    }
+
+    @Override
+    public void del(Integer merchId) {
+        merchMapper.del(merchId);
+    }
+
+    @Override
+    public void batchDel(Integer[] merchIds) {
+        merchMapper.batchDel(merchIds);
+    }
+}
diff --git a/work-modules/work-manage/src/main/resources/mapper/ManagerMapper.xml b/work-modules/work-manage/src/main/resources/mapper/ManagerMapper.xml
index b9ed6cd..b677b3d 100644
--- a/work-modules/work-manage/src/main/resources/mapper/ManagerMapper.xml
+++ b/work-modules/work-manage/src/main/resources/mapper/ManagerMapper.xml
@@ -32,7 +32,7 @@
         values (#{empName},#{username},#{password},#{empTel},#{empIdCard},#{empAge},#{empGender},#{empAddress},#{empSal})
     </sql>
 
-    <select id="list" resultType="com.bwie.common.domain.response.EmpResponse">
+    <select id="listManager" resultType="com.bwie.common.domain.response.EmpResponse">
         <include refid="selectEmpVo"/>
         <where>
             er.role_id in (2, 3)
@@ -42,6 +42,17 @@
         </where>
     </select>
 
+
+    <select id="listEmp" resultType="com.bwie.common.domain.response.EmpResponse">
+        <include refid="selectEmpVo"></include>
+        <where>
+            er.role_id = 4
+            <if test="null != empId">
+                and e.emp_id = #{empId}
+            </if>
+        </where>
+    </select>
+
     <insert id="add" useGeneratedKeys="true" keyProperty="empId">
         <include refid="insertEmp"></include>
     </insert>
diff --git a/work-modules/work-manage/src/main/resources/mapper/MerchMapper.xml b/work-modules/work-manage/src/main/resources/mapper/MerchMapper.xml
new file mode 100644
index 0000000..e9d545f
--- /dev/null
+++ b/work-modules/work-manage/src/main/resources/mapper/MerchMapper.xml
@@ -0,0 +1,71 @@
+<?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">
+<!-- mybatis数据层 namespace命名空间-->
+<mapper namespace="com.bwie.manage.mapper.MerchMapper">
+
+    <sql id="selectMerchVo">
+        select
+            m.merch_id, m.merch_name,m.merch_type,
+            t.type_name, m.merch_price,
+            m.bar_code, m.sales_pro_price,
+            m.factory_id, m.provide_id,
+            m.merch_dead_time, m.merch_num,
+            m.merch_sta
+        from tb_merch m
+            left join tb_type t on m.merch_type = t.type_id
+    </sql>
+
+    <select id="list" resultType="com.bwie.common.domain.response.MerchResponse">
+        <include refid="selectMerchVo"/>
+        <where>
+            <if test="null != merchId">
+                and m.merch_id = #{merchId}
+            </if>
+            <if test="null != merchType">
+                and m.merch_type = #{merchType}
+            </if>
+            <if test="null != merchName  and   '' != merchName">
+                and m.merch_name like concat('%',#{merchName},'%')
+            </if>
+        </where>
+    </select>
+
+    <insert id="add">
+        insert into tb_merch (merch_name, merch_type, merch_price, bar_code, sales_pro_price, factory_id, provide_id, merch_dead_time, merch_num, merch_sta)
+        values (#{merchName},#{merchType},#{merchPrice},#{barCode},#{salesProPrice},#{factoryId},#{provideId},#{merchDeadTime},#{merchNum},#{merchSta})
+    </insert>
+
+    <select id="findById" resultType="com.bwie.common.domain.Merch">
+        <include refid="selectMerchVo"/> where m.merch_id = #{merchId}
+    </select>
+
+    <update id="update">
+        update tb_merch
+        <set>
+            merch_name = #{merchName},
+            merch_type = #{merchType},
+            merch_price = #{merchPrice},
+            bar_code = #{barCode},
+            sales_pro_price = #{salesProPrice},
+            factory_id = #{factoryId},
+            provide_id = #{provideId},
+            merch_dead_time = #{merchDeadTime},
+            merch_num = #{merchNum},
+            merch_sta = #{merchSta}
+        </set>
+        where merch_id = #{merchId}
+    </update>
+
+    <delete id="del">
+        delete from tb_merch where merch_id = #{merchId}
+    </delete>
+
+    <delete id="batchDel">
+        delete from tb_merch where merch_id in
+        <foreach collection="merchIds" item="merchId" open="(" close=")" separator=",">
+            #{merchId}
+        </foreach>
+    </delete>
+</mapper>