Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusYezhuController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusYezhu;
+import org.jeecg.modules.business.service.IBusYezhuService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: bus_yezhu
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Api(tags="bus_yezhu")
+@RestController
+@RequestMapping("/business/busYezhu")
+@Slf4j
+public class BusYezhuController extends JeecgController<BusYezhu, IBusYezhuService> {
+	@Autowired
+	private IBusYezhuService busYezhuService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busYezhu
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "bus_yezhu-分页列表查询")
+	@ApiOperation(value="bus_yezhu-分页列表查询", notes="bus_yezhu-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusYezhu>> queryPageList(BusYezhu busYezhu,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusYezhu> queryWrapper = QueryGenerator.initQueryWrapper(busYezhu, req.getParameterMap());
+		Page<BusYezhu> page = new Page<BusYezhu>(pageNo, pageSize);
+		IPage<BusYezhu> pageList = busYezhuService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busYezhu
+	 * @return
+	 */
+	@AutoLog(value = "bus_yezhu-添加")
+	@ApiOperation(value="bus_yezhu-添加", notes="bus_yezhu-添加")
+	//@RequiresPermissions("business:bus_yezhu:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusYezhu busYezhu) {
+		busYezhuService.save(busYezhu);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busYezhu
+	 * @return
+	 */
+	@AutoLog(value = "bus_yezhu-编辑")
+	@ApiOperation(value="bus_yezhu-编辑", notes="bus_yezhu-编辑")
+	//@RequiresPermissions("business:bus_yezhu:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusYezhu busYezhu) {
+		busYezhuService.updateById(busYezhu);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "bus_yezhu-通过id删除")
+	@ApiOperation(value="bus_yezhu-通过id删除", notes="bus_yezhu-通过id删除")
+	//@RequiresPermissions("business:bus_yezhu:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busYezhuService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "bus_yezhu-批量删除")
+	@ApiOperation(value="bus_yezhu-批量删除", notes="bus_yezhu-批量删除")
+	//@RequiresPermissions("business:bus_yezhu:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busYezhuService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "bus_yezhu-通过id查询")
+	@ApiOperation(value="bus_yezhu-通过id查询", notes="bus_yezhu-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusYezhu> queryById(@RequestParam(name="id",required=true) String id) {
+		BusYezhu busYezhu = busYezhuService.getById(id);
+		if(busYezhu==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busYezhu);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busYezhu
+    */
+    //@RequiresPermissions("business:bus_yezhu:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusYezhu busYezhu) {
+        return super.exportXls(request, busYezhu, BusYezhu.class, "bus_yezhu");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_yezhu:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusYezhu.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusYezhuInRoomController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusYezhuInRoom;
+import org.jeecg.modules.business.service.IBusYezhuInRoomService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: bus_yezhu_in_room
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Api(tags="bus_yezhu_in_room")
+@RestController
+@RequestMapping("/business/busYezhuInRoom")
+@Slf4j
+public class BusYezhuInRoomController extends JeecgController<BusYezhuInRoom, IBusYezhuInRoomService> {
+	@Autowired
+	private IBusYezhuInRoomService busYezhuInRoomService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busYezhuInRoom
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "bus_yezhu_in_room-分页列表查询")
+	@ApiOperation(value="bus_yezhu_in_room-分页列表查询", notes="bus_yezhu_in_room-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusYezhuInRoom>> queryPageList(BusYezhuInRoom busYezhuInRoom,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusYezhuInRoom> queryWrapper = QueryGenerator.initQueryWrapper(busYezhuInRoom, req.getParameterMap());
+		Page<BusYezhuInRoom> page = new Page<BusYezhuInRoom>(pageNo, pageSize);
+		IPage<BusYezhuInRoom> pageList = busYezhuInRoomService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busYezhuInRoom
+	 * @return
+	 */
+	@AutoLog(value = "bus_yezhu_in_room-添加")
+	@ApiOperation(value="bus_yezhu_in_room-添加", notes="bus_yezhu_in_room-添加")
+	//@RequiresPermissions("business:bus_yezhu_in_room:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusYezhuInRoom busYezhuInRoom) {
+		busYezhuInRoomService.save(busYezhuInRoom);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busYezhuInRoom
+	 * @return
+	 */
+	@AutoLog(value = "bus_yezhu_in_room-编辑")
+	@ApiOperation(value="bus_yezhu_in_room-编辑", notes="bus_yezhu_in_room-编辑")
+	//@RequiresPermissions("business:bus_yezhu_in_room:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusYezhuInRoom busYezhuInRoom) {
+		busYezhuInRoomService.updateById(busYezhuInRoom);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "bus_yezhu_in_room-通过id删除")
+	@ApiOperation(value="bus_yezhu_in_room-通过id删除", notes="bus_yezhu_in_room-通过id删除")
+	//@RequiresPermissions("business:bus_yezhu_in_room:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busYezhuInRoomService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "bus_yezhu_in_room-批量删除")
+	@ApiOperation(value="bus_yezhu_in_room-批量删除", notes="bus_yezhu_in_room-批量删除")
+	//@RequiresPermissions("business:bus_yezhu_in_room:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busYezhuInRoomService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "bus_yezhu_in_room-通过id查询")
+	@ApiOperation(value="bus_yezhu_in_room-通过id查询", notes="bus_yezhu_in_room-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusYezhuInRoom> queryById(@RequestParam(name="id",required=true) String id) {
+		BusYezhuInRoom busYezhuInRoom = busYezhuInRoomService.getById(id);
+		if(busYezhuInRoom==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busYezhuInRoom);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busYezhuInRoom
+    */
+    //@RequiresPermissions("business:bus_yezhu_in_room:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusYezhuInRoom busYezhuInRoom) {
+        return super.exportXls(request, busYezhuInRoom, BusYezhuInRoom.class, "bus_yezhu_in_room");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_yezhu_in_room:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusYezhuInRoom.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusYezhu.java

@@ -0,0 +1,55 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: bus_yezhu
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_yezhu")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_yezhu对象", description="bus_yezhu")
+public class BusYezhu implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**平台登录账号id*/
+	@Excel(name = "平台登录账号id", width = 15)
+    @ApiModelProperty(value = "平台登录账号id")
+    private String sysUserId;
+	/**分成比例*/
+	@Excel(name = "分成比例", width = 15)
+    @ApiModelProperty(value = "分成比例")
+    private Integer commission;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusYezhuInRoom.java

@@ -0,0 +1,47 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: bus_yezhu_in_room
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_yezhu_in_room")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_yezhu_in_room对象", description="bus_yezhu_in_room")
+public class BusYezhuInRoom implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**业主id*/
+	@Excel(name = "业主id", width = 15)
+    @ApiModelProperty(value = "业主id")
+    private String busYezhuId;
+	/**房间id*/
+	@Excel(name = "房间id", width = 15)
+    @ApiModelProperty(value = "房间id")
+    private String roomId;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusYezhuInRoomMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.business.entity.BusYezhuInRoom;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: bus_yezhu_in_room
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface BusYezhuInRoomMapper extends BaseMapper<BusYezhuInRoom> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusYezhuMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.business.entity.BusYezhu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: bus_yezhu
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface BusYezhuMapper extends BaseMapper<BusYezhu> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAdvertContentMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusAdvertContentMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusAdvertContentMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAdvertMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusAdvertMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusAdvertMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAgreementReturnedCommissionDetailMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusAgreementReturnedCommissionDetailMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusAgreementReturnedCommissionDetailMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAgreementUnitMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusAgreementUnitMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusAgreementUnitMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusCancelMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusCancelMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusCancelMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusClearMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusClearMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusClearMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusDepositSettingMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusDepositSettingMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusDepositSettingMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusDictItemMapper.xml

@@ -1,4 +1,4 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusDictItemMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusDictItemMapper">
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusDictMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusDictMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusDictMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusDoorLockMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusDoorLockMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusDoorLockMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusHotelMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusHotelMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusHotelMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusHousePriceSchemeLayoutMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusHousePriceSchemeLayoutMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusHousePriceSchemeLayoutMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusHouseSettingMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusHouseSettingMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusHouseSettingMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementContactsMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketAgreementContactsMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketAgreementContactsMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementCustomerHousePriceMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketAgreementCustomerHousePriceMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketAgreementCustomerHousePriceMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementCustomerMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketAgreementCustomerMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketAgreementCustomerMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketCouponsCashUsedMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketCouponsCashUsedMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketCouponsCashUsedMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketCouponsEventDetailMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketCouponsEventDetailMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketCouponsEventDetailMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketCouponsEventMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketCouponsEventMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketCouponsEventMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketCouponsUsedMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketCouponsUsedMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketCouponsUsedMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketMealCouponsUsedMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketMealCouponsUsedMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketMealCouponsUsedMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketMemberGroupMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketMemberGroupMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketMemberGroupMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketMemberLableMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketMemberLableMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketMemberLableMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketMemberMapper.xml

@@ -1,4 +1,4 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketMemberMapper">
-</mapper>
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketMemberMapper">
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketObjectiveMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketObjectiveMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketObjectiveMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketRechargeMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketRechargeMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketRechargeMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMealCouponMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMealCouponMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMealCouponMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMeetingRoomMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMeetingRoomMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMeetingRoomMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMeetingRoomScheduleOrderDetailMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMeetingRoomScheduleOrderDetailMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMeetingRoomScheduleOrderDetailMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMemberBalanceLogMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMemberBalanceLogMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMemberBalanceLogMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMemberCardMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMemberCardMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMemberCardMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMemberGoodsManageMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMemberGoodsManageMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMemberGoodsManageMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMemberMessageMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMemberMessageMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMemberMessageMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMemberPointLogMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMemberPointLogMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMemberPointLogMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusNightTrialMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusNightTrialMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusNightTrialMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusOrderSoundMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusOrderSoundMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusOrderSoundMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusOtherCheckoutMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusOtherCheckoutMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusOtherCheckoutMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusOtherEmptyDirtyRoomMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusOtherEmptyDirtyRoomMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusOtherEmptyDirtyRoomMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusOtherMemberVerifyMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusOtherMemberVerifyMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusOtherMemberVerifyMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusOtherRoomCardMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusOtherRoomCardMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusOtherRoomCardMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusParamComputeFormulaMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusParamComputeFormulaMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusParamComputeFormulaMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusParamPresetMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusParamPresetMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusParamPresetMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusParamPresetSyncMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusParamPresetSyncMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusParamPresetSyncMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusParamPrintHideMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusParamPrintHideMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusParamPrintHideMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusParamShareMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusParamShareMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusParamShareMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusParamWeepMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusParamWeepMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusParamWeepMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusParamXcxRoomMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusParamXcxRoomMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusParamXcxRoomMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusPayInterfaceConfigMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusPayInterfaceConfigMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusPayInterfaceConfigMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusPrintTemplateMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusPrintTemplateMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusPrintTemplateMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusRoomPayTypeMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusRoomPayTypeMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusRoomPayTypeMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusRoomUtilitySettingMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusRoomUtilitySettingMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusRoomUtilitySettingMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusSalesPersonMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusSalesPersonMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusSalesPersonMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusSalesPersonPostMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusSalesPersonPostMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusSalesPersonPostMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusServiceRepairCategoryMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusServiceRepairCategoryMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusServiceRepairCategoryMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusServiceRepairMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusServiceRepairMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusServiceRepairMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusWaiterMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusWaiterMapper">
+<mapper namespace="org.jeecg.modules.business.mapper.BusWaiterMapper">
 
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusYezhuInRoomMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.business.mapper.BusYezhuInRoomMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusYezhuMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.business.mapper.BusYezhuMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusYezhuInRoomService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import org.jeecg.modules.business.entity.BusYezhuInRoom;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: bus_yezhu_in_room
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface IBusYezhuInRoomService extends IService<BusYezhuInRoom> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusYezhuService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import org.jeecg.modules.business.entity.BusYezhu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: bus_yezhu
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface IBusYezhuService extends IService<BusYezhu> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusYezhuInRoomServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusYezhuInRoom;
+import org.jeecg.modules.business.mapper.BusYezhuInRoomMapper;
+import org.jeecg.modules.business.service.IBusYezhuInRoomService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: bus_yezhu_in_room
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Service
+public class BusYezhuInRoomServiceImpl extends ServiceImpl<BusYezhuInRoomMapper, BusYezhuInRoom> implements IBusYezhuInRoomService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusYezhuServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusYezhu;
+import org.jeecg.modules.business.mapper.BusYezhuMapper;
+import org.jeecg.modules.business.service.IBusYezhuService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: bus_yezhu
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Service
+public class BusYezhuServiceImpl extends ServiceImpl<BusYezhuMapper, BusYezhu> implements IBusYezhuService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosJialiaoConfigController.java

@@ -0,0 +1,208 @@
+package org.jeecg.modules.pos.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.pos.entity.PosJialiaoConfig;
+import org.jeecg.modules.pos.entity.PosJialiaoConfigDetail;
+import org.jeecg.modules.pos.entity.PosKwConfigDetail;
+import org.jeecg.modules.pos.service.IPosJialiaoConfigDetailService;
+import org.jeecg.modules.pos.service.IPosJialiaoConfigService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: pos_jialiao_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Api(tags="pos_jialiao_config")
+@RestController
+@RequestMapping("/pos/posJialiaoConfig")
+@Slf4j
+public class PosJialiaoConfigController extends JeecgController<PosJialiaoConfig, IPosJialiaoConfigService> {
+	@Autowired
+	private IPosJialiaoConfigService posJialiaoConfigService;
+@Resource
+private IPosJialiaoConfigDetailService posJialiaoConfigDetailService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param posJialiaoConfig
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "pos_jialiao_config-分页列表查询")
+	@ApiOperation(value="pos_jialiao_config-分页列表查询", notes="pos_jialiao_config-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<PosJialiaoConfig>> queryPageList(PosJialiaoConfig posJialiaoConfig,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PosJialiaoConfig> queryWrapper = QueryGenerator.initQueryWrapper(posJialiaoConfig, req.getParameterMap());
+		Page<PosJialiaoConfig> page = new Page<PosJialiaoConfig>(pageNo, pageSize);
+		IPage<PosJialiaoConfig> pageList = posJialiaoConfigService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param posJialiaoConfig
+	 * @return
+	 */
+	@AutoLog(value = "pos_jialiao_config-添加")
+	@ApiOperation(value="pos_jialiao_config-添加", notes="pos_jialiao_config-添加")
+	//@RequiresPermissions("pos:pos_jialiao_config:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody PosJialiaoConfig posJialiaoConfig) {
+		if (posJialiaoConfig.getTenantId() == null || posJialiaoConfig.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				posJialiaoConfig.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		posJialiaoConfigService.save(posJialiaoConfig);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param posJialiaoConfig
+	 * @return
+	 */
+	@AutoLog(value = "pos_jialiao_config-编辑")
+	@ApiOperation(value="pos_jialiao_config-编辑", notes="pos_jialiao_config-编辑")
+	//@RequiresPermissions("pos:pos_jialiao_config:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody PosJialiaoConfig posJialiaoConfig) {
+		posJialiaoConfigService.updateById(posJialiaoConfig);
+		if (ObjectUtils.isNotEmpty(posJialiaoConfig.getDetailList())) {
+			LambdaQueryWrapper<PosJialiaoConfigDetail> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(PosJialiaoConfigDetail::getJialiaoConfigId,posJialiaoConfig.getId());
+			posJialiaoConfigDetailService.remove(lambdaQueryWrapper);
+
+			posJialiaoConfig.getDetailList().forEach(t -> {
+				t.setJialiaoConfigId(posJialiaoConfig.getId());
+			});
+			posJialiaoConfigDetailService.saveBatch(posJialiaoConfig.getDetailList());
+		}
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pos_jialiao_config-通过id删除")
+	@ApiOperation(value="pos_jialiao_config-通过id删除", notes="pos_jialiao_config-通过id删除")
+	//@RequiresPermissions("pos:pos_jialiao_config:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		posJialiaoConfigService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pos_jialiao_config-批量删除")
+	@ApiOperation(value="pos_jialiao_config-批量删除", notes="pos_jialiao_config-批量删除")
+	//@RequiresPermissions("pos:pos_jialiao_config:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.posJialiaoConfigService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "pos_jialiao_config-通过id查询")
+	@ApiOperation(value="pos_jialiao_config-通过id查询", notes="pos_jialiao_config-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<PosJialiaoConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		PosJialiaoConfig posJialiaoConfig = posJialiaoConfigService.getById(id);
+		if(posJialiaoConfig==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(posJialiaoConfig);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param posJialiaoConfig
+    */
+    //@RequiresPermissions("pos:pos_jialiao_config:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PosJialiaoConfig posJialiaoConfig) {
+        return super.exportXls(request, posJialiaoConfig, PosJialiaoConfig.class, "pos_jialiao_config");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("pos:pos_jialiao_config:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PosJialiaoConfig.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosJialiaoConfigDetailController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.pos.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.pos.entity.PosJialiaoConfigDetail;
+import org.jeecg.modules.pos.service.IPosJialiaoConfigDetailService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: pos_jialiao_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Api(tags="pos_jialiao_config_detail")
+@RestController
+@RequestMapping("/pos/posJialiaoConfigDetail")
+@Slf4j
+public class PosJialiaoConfigDetailController extends JeecgController<PosJialiaoConfigDetail, IPosJialiaoConfigDetailService> {
+	@Autowired
+	private IPosJialiaoConfigDetailService posJialiaoConfigDetailService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param posJialiaoConfigDetail
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "pos_jialiao_config_detail-分页列表查询")
+	@ApiOperation(value="pos_jialiao_config_detail-分页列表查询", notes="pos_jialiao_config_detail-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<PosJialiaoConfigDetail>> queryPageList(PosJialiaoConfigDetail posJialiaoConfigDetail,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PosJialiaoConfigDetail> queryWrapper = QueryGenerator.initQueryWrapper(posJialiaoConfigDetail, req.getParameterMap());
+		Page<PosJialiaoConfigDetail> page = new Page<PosJialiaoConfigDetail>(pageNo, pageSize);
+		IPage<PosJialiaoConfigDetail> pageList = posJialiaoConfigDetailService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param posJialiaoConfigDetail
+	 * @return
+	 */
+	@AutoLog(value = "pos_jialiao_config_detail-添加")
+	@ApiOperation(value="pos_jialiao_config_detail-添加", notes="pos_jialiao_config_detail-添加")
+	//@RequiresPermissions("pos:pos_jialiao_config_detail:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody PosJialiaoConfigDetail posJialiaoConfigDetail) {
+		posJialiaoConfigDetailService.save(posJialiaoConfigDetail);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param posJialiaoConfigDetail
+	 * @return
+	 */
+	@AutoLog(value = "pos_jialiao_config_detail-编辑")
+	@ApiOperation(value="pos_jialiao_config_detail-编辑", notes="pos_jialiao_config_detail-编辑")
+	//@RequiresPermissions("pos:pos_jialiao_config_detail:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody PosJialiaoConfigDetail posJialiaoConfigDetail) {
+		posJialiaoConfigDetailService.updateById(posJialiaoConfigDetail);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pos_jialiao_config_detail-通过id删除")
+	@ApiOperation(value="pos_jialiao_config_detail-通过id删除", notes="pos_jialiao_config_detail-通过id删除")
+	//@RequiresPermissions("pos:pos_jialiao_config_detail:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		posJialiaoConfigDetailService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pos_jialiao_config_detail-批量删除")
+	@ApiOperation(value="pos_jialiao_config_detail-批量删除", notes="pos_jialiao_config_detail-批量删除")
+	//@RequiresPermissions("pos:pos_jialiao_config_detail:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.posJialiaoConfigDetailService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "pos_jialiao_config_detail-通过id查询")
+	@ApiOperation(value="pos_jialiao_config_detail-通过id查询", notes="pos_jialiao_config_detail-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<PosJialiaoConfigDetail> queryById(@RequestParam(name="id",required=true) String id) {
+		PosJialiaoConfigDetail posJialiaoConfigDetail = posJialiaoConfigDetailService.getById(id);
+		if(posJialiaoConfigDetail==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(posJialiaoConfigDetail);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param posJialiaoConfigDetail
+    */
+    //@RequiresPermissions("pos:pos_jialiao_config_detail:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PosJialiaoConfigDetail posJialiaoConfigDetail) {
+        return super.exportXls(request, posJialiaoConfigDetail, PosJialiaoConfigDetail.class, "pos_jialiao_config_detail");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("pos:pos_jialiao_config_detail:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PosJialiaoConfigDetail.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosKwConfigController.java

@@ -0,0 +1,213 @@
+package org.jeecg.modules.pos.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.pos.entity.PosKwConfig;
+import org.jeecg.modules.pos.entity.PosKwConfigDetail;
+import org.jeecg.modules.pos.service.IPosKwConfigDetailService;
+import org.jeecg.modules.pos.service.IPosKwConfigService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: pos_kw_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Api(tags="pos_kw_config")
+@RestController
+@RequestMapping("/pos/posKwConfig")
+@Slf4j
+public class PosKwConfigController extends JeecgController<PosKwConfig, IPosKwConfigService> {
+	@Autowired
+	private IPosKwConfigService posKwConfigService;
+	@Resource
+	private IPosKwConfigDetailService posKwConfigDetailService;
+
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param posKwConfig
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "pos_kw_config-分页列表查询")
+	@ApiOperation(value="pos_kw_config-分页列表查询", notes="pos_kw_config-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<PosKwConfig>> queryPageList(PosKwConfig posKwConfig,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PosKwConfig> queryWrapper = QueryGenerator.initQueryWrapper(posKwConfig, req.getParameterMap());
+		Page<PosKwConfig> page = new Page<PosKwConfig>(pageNo, pageSize);
+		IPage<PosKwConfig> pageList = posKwConfigService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param posKwConfig
+	 * @return
+	 */
+	@AutoLog(value = "pos_kw_config-添加")
+	@ApiOperation(value="pos_kw_config-添加", notes="pos_kw_config-添加")
+	//@RequiresPermissions("pos:pos_kw_config:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody PosKwConfig posKwConfig) {
+		if (posKwConfig.getTenantId() == null || posKwConfig.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				posKwConfig.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		posKwConfigService.save(posKwConfig);
+		if (ObjectUtils.isNotEmpty(posKwConfig.getDetailList())) {
+			posKwConfig.getDetailList().forEach(t -> {
+				t.setKwConfigId(posKwConfig.getId());
+			});
+			posKwConfigDetailService.saveBatch(posKwConfig.getDetailList());
+		}
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param posKwConfig
+	 * @return
+	 */
+	@AutoLog(value = "pos_kw_config-编辑")
+	@ApiOperation(value="pos_kw_config-编辑", notes="pos_kw_config-编辑")
+	//@RequiresPermissions("pos:pos_kw_config:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody PosKwConfig posKwConfig) {
+		posKwConfigService.updateById(posKwConfig);
+		LambdaQueryWrapper<PosKwConfigDetail> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PosKwConfigDetail::getKwConfigId,posKwConfig.getId());
+		posKwConfigDetailService.remove(lambdaQueryWrapper);
+		if (ObjectUtils.isNotEmpty(posKwConfig.getDetailList())) {
+			posKwConfig.getDetailList().forEach(t -> {
+				t.setKwConfigId(posKwConfig.getId());
+			});
+			posKwConfigDetailService.saveBatch(posKwConfig.getDetailList());
+		}
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pos_kw_config-通过id删除")
+	@ApiOperation(value="pos_kw_config-通过id删除", notes="pos_kw_config-通过id删除")
+	//@RequiresPermissions("pos:pos_kw_config:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		posKwConfigService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pos_kw_config-批量删除")
+	@ApiOperation(value="pos_kw_config-批量删除", notes="pos_kw_config-批量删除")
+	//@RequiresPermissions("pos:pos_kw_config:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.posKwConfigService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "pos_kw_config-通过id查询")
+	@ApiOperation(value="pos_kw_config-通过id查询", notes="pos_kw_config-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<PosKwConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		PosKwConfig posKwConfig = posKwConfigService.getById(id);
+		if(posKwConfig==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(posKwConfig);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param posKwConfig
+    */
+    //@RequiresPermissions("pos:pos_kw_config:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PosKwConfig posKwConfig) {
+        return super.exportXls(request, posKwConfig, PosKwConfig.class, "pos_kw_config");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("pos:pos_kw_config:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PosKwConfig.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosKwConfigDetailController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.pos.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.pos.entity.PosKwConfigDetail;
+import org.jeecg.modules.pos.service.IPosKwConfigDetailService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: pos_kw_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Api(tags="pos_kw_config_detail")
+@RestController
+@RequestMapping("/pos/posKwConfigDetail")
+@Slf4j
+public class PosKwConfigDetailController extends JeecgController<PosKwConfigDetail, IPosKwConfigDetailService> {
+	@Autowired
+	private IPosKwConfigDetailService posKwConfigDetailService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param posKwConfigDetail
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "pos_kw_config_detail-分页列表查询")
+	@ApiOperation(value="pos_kw_config_detail-分页列表查询", notes="pos_kw_config_detail-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<PosKwConfigDetail>> queryPageList(PosKwConfigDetail posKwConfigDetail,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PosKwConfigDetail> queryWrapper = QueryGenerator.initQueryWrapper(posKwConfigDetail, req.getParameterMap());
+		Page<PosKwConfigDetail> page = new Page<PosKwConfigDetail>(pageNo, pageSize);
+		IPage<PosKwConfigDetail> pageList = posKwConfigDetailService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param posKwConfigDetail
+	 * @return
+	 */
+	@AutoLog(value = "pos_kw_config_detail-添加")
+	@ApiOperation(value="pos_kw_config_detail-添加", notes="pos_kw_config_detail-添加")
+	//@RequiresPermissions("pos:pos_kw_config_detail:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody PosKwConfigDetail posKwConfigDetail) {
+		posKwConfigDetailService.save(posKwConfigDetail);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param posKwConfigDetail
+	 * @return
+	 */
+	@AutoLog(value = "pos_kw_config_detail-编辑")
+	@ApiOperation(value="pos_kw_config_detail-编辑", notes="pos_kw_config_detail-编辑")
+	//@RequiresPermissions("pos:pos_kw_config_detail:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody PosKwConfigDetail posKwConfigDetail) {
+		posKwConfigDetailService.updateById(posKwConfigDetail);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "pos_kw_config_detail-通过id删除")
+	@ApiOperation(value="pos_kw_config_detail-通过id删除", notes="pos_kw_config_detail-通过id删除")
+	//@RequiresPermissions("pos:pos_kw_config_detail:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		posKwConfigDetailService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "pos_kw_config_detail-批量删除")
+	@ApiOperation(value="pos_kw_config_detail-批量删除", notes="pos_kw_config_detail-批量删除")
+	//@RequiresPermissions("pos:pos_kw_config_detail:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.posKwConfigDetailService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "pos_kw_config_detail-通过id查询")
+	@ApiOperation(value="pos_kw_config_detail-通过id查询", notes="pos_kw_config_detail-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<PosKwConfigDetail> queryById(@RequestParam(name="id",required=true) String id) {
+		PosKwConfigDetail posKwConfigDetail = posKwConfigDetailService.getById(id);
+		if(posKwConfigDetail==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(posKwConfigDetail);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param posKwConfigDetail
+    */
+    //@RequiresPermissions("pos:pos_kw_config_detail:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PosKwConfigDetail posKwConfigDetail) {
+        return super.exportXls(request, posKwConfigDetail, PosKwConfigDetail.class, "pos_kw_config_detail");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("pos:pos_kw_config_detail:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PosKwConfigDetail.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosTableController.java

@@ -212,6 +212,58 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 		 return Result.OK("添加成功！");
 	 }
 
+	 @AutoLog(value = "pos_table-添加")
+	 @ApiOperation(value = "pos_table-添加", notes = "pos_table-添加")
+	 //@RequiresPermissions("pos:pos_table:add")
+	 @PostMapping(value = "/addBatch")
+	 public Result<String> addBatch(@RequestBody List<PosTable> posTables) {
+		 if (posTables.size() > 100) {
+			 return Result.error("批量添加不能超过100个桌台！");
+		 }
+		 posTables.forEach(posTable -> {
+			 if (posTable.getTenantId() == null || posTable.getTenantId().equals("")) {
+				 LoginUser user = TokenUtils.getAuthUser();
+				 if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+					 posTable.setTenantId(user.getRelTenantIds());
+				 } else {
+					 throw new JeecgBootException("当前登录人租户信息错误");
+				 }
+			 }
+
+			 posTable.setId(UUIDGenerator.generate());
+			 LambdaQueryWrapper<WxAppConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			 lambdaQueryWrapper.eq(WxAppConfig::getTenantId, posTable.getTenantId());
+			 WxAppConfig wxApp = wxAppConfigService.getOne(lambdaQueryWrapper);
+			 if (wxApp == null) {
+				 throw new JeecgBootException("没有找到此appid");
+			 }
+			 //获取小程序二维码
+			 try {
+				 WxMaInRedisConfigStorage configStorage = new WxMaInRedisConfigStorage(redisTemplate);
+				 configStorage.setAppid(wxApp.getAppId());
+				 configStorage.setSecret(wxApp.getAppSecret());
+				 WxMaService wxMaService = new WxMaServiceImpl();
+				 wxMaService.setWxMaConfig(configStorage);
+
+				 File file = wxMaService.getQrcodeService().createQrcode("page/dc/index?id=" + posTable.getId(), 430);
+				 try {
+					 MultipartFile cMultiFile = new MockMultipartFile("file", file.getName(), null, new FileInputStream(file));
+					 String path = CommonUtils.upload(cMultiFile, "temp", CommonConstant.UPLOAD_TYPE_OSS);
+					 posTable.setQrCode(path);
+				 } catch (IOException e) {
+					 e.printStackTrace();
+				 }
+
+			 } catch (WxErrorException e) {
+				 e.printStackTrace();
+
+				 throw new JeecgBootException("获取小程序二维码失败：" + e.getMessage());
+			 }
+		 });
+		 posTableService.saveBatch(posTables);
+		 return Result.OK("添加成功！");
+	 }
+
 
 	 /**
 	  * 桌台用餐下单

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosJialiaoConfig.java

@@ -0,0 +1,62 @@
+package org.jeecg.modules.pos.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pos_jialiao_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("pos_jialiao_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pos_jialiao_config对象", description="pos_jialiao_config")
+public class PosJialiaoConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**是否开启*/
+	@Excel(name = "是否开启", width = 15)
+    @ApiModelProperty(value = "是否开启")
+    private Boolean state;
+	/**加料金额*/
+	@Excel(name = "加料金额", width = 15)
+    @ApiModelProperty(value = "加料金额")
+    private BigDecimal money;
+	/**加料名称*/
+	@Excel(name = "加料名称", width = 15)
+    @ApiModelProperty(value = "加料名称")
+    private String name;
+
+    @ApiModelProperty(value = "商品列表")
+    @TableField(exist = false)
+	private List<PosJialiaoConfigDetail> detailList;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosJialiaoConfigDetail.java

@@ -0,0 +1,47 @@
+package org.jeecg.modules.pos.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pos_jialiao_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("pos_jialiao_config_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pos_jialiao_config_detail对象", description="pos_jialiao_config_detail")
+public class PosJialiaoConfigDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**加料id*/
+	@Excel(name = "加料id", width = 15)
+    @ApiModelProperty(value = "加料id")
+    private String jialiaoConfigId;
+	/**商品id*/
+	@Excel(name = "商品id", width = 15)
+    @ApiModelProperty(value = "商品id")
+    private String goodsId;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosKwConfig.java

@@ -0,0 +1,70 @@
+package org.jeecg.modules.pos.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pos_kw_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("pos_kw_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pos_kw_config对象", description="pos_kw_config")
+public class PosKwConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**是否开启*/
+	@Excel(name = "是否开启", width = 15)
+    @ApiModelProperty(value = "是否开启")
+    private Boolean state;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+	/**应用范围 0全部菜品 1菜品分类 2菜品*/
+	@Excel(name = "应用范围 0全部菜品 1菜品分类 2菜品", width = 15)
+    @ApiModelProperty(value = "应用范围 0全部菜品 1菜品分类 2菜品")
+    private Integer type;
+	/**加价金额*/
+	@Excel(name = "加价金额", width = 15)
+    @ApiModelProperty(value = "加价金额")
+    private BigDecimal money;
+	/**口味名称*/
+	@Excel(name = "口味名称", width = 15)
+    @ApiModelProperty(value = "口味名称")
+    private String name;
+
+    @ApiModelProperty(value = "分类或商品列表")
+    @TableField(exist = false)
+    private List<PosKwConfigDetail> detailList;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosKwConfigDetail.java

@@ -0,0 +1,47 @@
+package org.jeecg.modules.pos.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: pos_kw_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("pos_kw_config_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pos_kw_config_detail对象", description="pos_kw_config_detail")
+public class PosKwConfigDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**口味id*/
+	@Excel(name = "口味id", width = 15)
+    @ApiModelProperty(value = "口味id")
+    private String kwConfigId;
+	/**分类或菜品id*/
+	@Excel(name = "分类或菜品id", width = 15)
+    @ApiModelProperty(value = "分类或菜品id")
+    private String goodsId;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/PosJialiaoConfigDetailMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.pos.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.pos.entity.PosJialiaoConfigDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: pos_jialiao_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface PosJialiaoConfigDetailMapper extends BaseMapper<PosJialiaoConfigDetail> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/PosJialiaoConfigMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.pos.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.pos.entity.PosJialiaoConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: pos_jialiao_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface PosJialiaoConfigMapper extends BaseMapper<PosJialiaoConfig> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/PosKwConfigDetailMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.pos.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.pos.entity.PosKwConfigDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: pos_kw_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface PosKwConfigDetailMapper extends BaseMapper<PosKwConfigDetail> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/PosKwConfigMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.pos.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.pos.entity.PosKwConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: pos_kw_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface PosKwConfigMapper extends BaseMapper<PosKwConfig> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/xml/PosJialiaoConfigDetailMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.demo.pos.mapper.PosJialiaoConfigDetailMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/xml/PosJialiaoConfigMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.demo.pos.mapper.PosJialiaoConfigMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/xml/PosKwConfigDetailMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.demo.pos.mapper.PosKwConfigDetailMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/xml/PosKwConfigMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.demo.pos.mapper.PosKwConfigMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/IPosJialiaoConfigDetailService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.pos.service;
+
+import org.jeecg.modules.pos.entity.PosJialiaoConfigDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: pos_jialiao_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface IPosJialiaoConfigDetailService extends IService<PosJialiaoConfigDetail> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/IPosJialiaoConfigService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.pos.service;
+
+import org.jeecg.modules.pos.entity.PosJialiaoConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: pos_jialiao_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface IPosJialiaoConfigService extends IService<PosJialiaoConfig> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/IPosKwConfigDetailService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.pos.service;
+
+import org.jeecg.modules.pos.entity.PosKwConfigDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: pos_kw_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface IPosKwConfigDetailService extends IService<PosKwConfigDetail> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/IPosKwConfigService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.pos.service;
+
+import org.jeecg.modules.pos.entity.PosKwConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: pos_kw_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+public interface IPosKwConfigService extends IService<PosKwConfig> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/impl/PosJialiaoConfigDetailServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.pos.service.impl;
+
+import org.jeecg.modules.pos.entity.PosJialiaoConfigDetail;
+import org.jeecg.modules.pos.mapper.PosJialiaoConfigDetailMapper;
+import org.jeecg.modules.pos.service.IPosJialiaoConfigDetailService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: pos_jialiao_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Service
+public class PosJialiaoConfigDetailServiceImpl extends ServiceImpl<PosJialiaoConfigDetailMapper, PosJialiaoConfigDetail> implements IPosJialiaoConfigDetailService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/impl/PosJialiaoConfigServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.pos.service.impl;
+
+import org.jeecg.modules.pos.entity.PosJialiaoConfig;
+import org.jeecg.modules.pos.mapper.PosJialiaoConfigMapper;
+import org.jeecg.modules.pos.service.IPosJialiaoConfigService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: pos_jialiao_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Service
+public class PosJialiaoConfigServiceImpl extends ServiceImpl<PosJialiaoConfigMapper, PosJialiaoConfig> implements IPosJialiaoConfigService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/impl/PosKwConfigDetailServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.pos.service.impl;
+
+import org.jeecg.modules.pos.entity.PosKwConfigDetail;
+import org.jeecg.modules.pos.mapper.PosKwConfigDetailMapper;
+import org.jeecg.modules.pos.service.IPosKwConfigDetailService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: pos_kw_config_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Service
+public class PosKwConfigDetailServiceImpl extends ServiceImpl<PosKwConfigDetailMapper, PosKwConfigDetail> implements IPosKwConfigDetailService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/impl/PosKwConfigServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.pos.service.impl;
+
+import org.jeecg.modules.pos.entity.PosKwConfig;
+import org.jeecg.modules.pos.mapper.PosKwConfigMapper;
+import org.jeecg.modules.pos.service.IPosKwConfigService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: pos_kw_config
+ * @Author: jeecg-boot
+ * @Date:   2023-05-19
+ * @Version: V1.0
+ */
+@Service
+public class PosKwConfigServiceImpl extends ServiceImpl<PosKwConfigMapper, PosKwConfig> implements IPosKwConfigService {
+
+}