From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMenuMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMenuMapper.xml
similarity index 70%
rename from hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml
rename to hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMenuMapper.xml
index 37b0072..af0749b 100644
--- a/hangzhoumesParent/common/displayscreen/src/main/java/com/mes/orderdetail/mapper/xml/OrderDetailMapper.xml
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/xml/SysRoleMenuMapper.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="com.mes.orderdetail.mapper.OrderDetailMapper">
+<mapper namespace="com.mes.role.mapper.SysRoleMenuMapper">
 
 </mapper>

--
Gitblit v1.8.0