fix tpm依赖、CmmsUpkeep

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/xml/CmmsUpkeepMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsUpkeep.mapper.CmmsUpkeepMapper">
 
-    <resultMap type="CmmsUpkeep" id="CmmsUpkeepResult">
+    <resultMap type="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep" id="CmmsUpkeepResult">
         <result property="id"    column="id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -27,7 +27,7 @@
     </resultMap>
 
     <!-- 查询我的代办 -->
-    <select id="selectMyChargeList" parameterType="CmmsUpkeep" resultMap="CmmsUpkeepResult">
+    <select id="selectMyChargeList" parameterType="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep" resultMap="CmmsUpkeepResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark, c.upkeepcode,
         c.upkeepplanid, c.upkeepprojid, c.projectname, c.planname, c.address, c.supplier, c.suppliertel,
         c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion
@@ -41,7 +41,7 @@
     </select>
 
     <!-- 查询我的相关 -->
-    <select id="selectMyRelateList" parameterType="CmmsUpkeep" resultMap="CmmsUpkeepResult">
+    <select id="selectMyRelateList" parameterType="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep" resultMap="CmmsUpkeepResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark, c.upkeepcode,
         c.upkeepplanid, c.upkeepprojid, c.projectname, c.planname, c.address, c.supplier, c.suppliertel,
         c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion

module_tpm/pom.xml

@@ -20,10 +20,6 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-base-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>module_cmms</artifactId>
-        </dependency>
 
         <!--  mapstruct      -->
         <dependency>