处理模块mapper问题

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java

@@ -1,93 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.ext.api.validate.group.AddGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-/**
- * 字典数据表 sys_dict_data
- * 
- * @author ruoyi
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@TableName("sys_dict_data")
-@ApiModel("字典数据表")
-public class SysDictData extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 字典编码 */
-    @ApiModelProperty(value = "字典编码")
-    @TableId(value = "dict_code",type = IdType.AUTO)
-    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
-    private Long dictCode;
-
-    /** 字典排序 */
-    @ApiModelProperty(value = "字典排序")
-    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
-    private Long dictSort;
-
-    /** 字典标签 */
-    @ApiModelProperty(value = "字典标签")
-    @NotBlank(message = "字典标签不能为空",groups = AddGroup.class)
-    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    @Excel(name = "字典标签")
-    private String dictLabel;
-
-    /** 字典键值 */
-    @ApiModelProperty(value = "字典键值")
-    @NotBlank(message = "字典键值不能为空",groups = AddGroup.class)
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    @Excel(name = "字典键值")
-    private String dictValue;
-
-    /** 字典类型 */
-    @ApiModelProperty(value = "字典类型")
-    @NotBlank(message = "字典类型不能为空",groups = AddGroup.class)
-    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    @Excel(name = "字典类型")
-    private String dictType;
-
-    /** 样式属性（其他样式扩展） */
-    @ApiModelProperty(value = "样式属性（其他样式扩展）")
-    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    private String cssClass;
-
-    /** 表格字典样式 */
-    @ApiModelProperty(value = "表格字典样式")
-    private String listClass;
-
-    /** 是否默认（Y是 N否） */
-    @ApiModelProperty(value = "是否默认（Y是 N否）")
-    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
-    private String isDefault;
-
-    /** 状态（0正常 1停用） */
-    @ApiModelProperty(value = "状态（0正常 1停用）")
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    /** 备注 */
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    /** 字典父级键值 */
-    @ApiModelProperty(value = "字典父级键值")
-    @Excel(name = "字典父级键值")
-    private String dictParentValue;
-
-}

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java

@@ -6,7 +6,7 @@ import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.redis.configure.RedisKeySerializer;
 import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.system.api.domain.SysDictData;
+import com.ruoyi.ext.api.domain.SysDictData;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.Collection;

ruoyi-modules/mz-business-djpd/pom.xml

@@ -67,8 +67,7 @@
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-modules-organization-jg</artifactId>
-            <version>3.6.0</version>
-            <scope>compile</scope>
+            <version>${ruoyi.version}</version>
         </dependency>
     </dependencies>
 

ruoyi-modules/mz-business-hljnds/src/main/resources/mapper/business/ZwywHldsCtzcMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="state"    column="state"    />
     </resultMap>
-    <select id="selectZwywHldsMtList" resultType="com.ruoyi.business.domain.ZwywHldsCtzc">
+    <select id="selectZwywHldsMtList" resultType="ZwywHldsCtzc">
                 SELECT
             id,
             zcmc,

ruoyi-modules/mz-business-hljnds/src/main/resources/mapper/business/ZwywHldsMtMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="state"    column="state"    />
     </resultMap>
-    <select id="selectZwywHldsMtList" resultType="com.ruoyi.business.domain.ZwywHldsMt">
+    <select id="selectZwywHldsMtList" resultType="ZwywHldsMt">
                 SELECT
             id,
             mtmc,

ruoyi-modules/mz-business-hljnds/src/main/resources/mapper/business/ZwywHldsTqhdMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="state"    column="state"    />
     </resultMap>
-    <select id="selectZwywHldsTqhdList" resultType="com.ruoyi.business.domain.ZwywHldsTqhd">
+    <select id="selectZwywHldsTqhdList" resultType="ZwywHldsTqhd">
         SELECT
         id,
         tqhd,

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/domain/SysDeptJl.java

@@ -1,63 +0,0 @@
-package com.ruoyi.business.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.ext.api.validate.NumberV;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.Size;
-
-/**
- * 吉林地区管理对象 sys_dept_jl
- *
- * @author CH
- * @date 2022-03-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@TableName("sys_dept_jl")
-@ApiModel("吉林地区管理对象")
-public class SysDeptJl extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 编号 */
-    @ApiModelProperty(value = "编号")
-    @TableId(value = "id",type = IdType.ASSIGN_UUID)
-    private String id;
-
-    /** 行政区编码 */
-    @Excel(name = "行政区编码")
-    @ApiModelProperty(value = "行政区编码")
-    @Size(min  = 1, max = 64, message = "{行政区编码}")
-    private String code;
-
-    /** 行政区名 */
-    @Excel(name = "行政区名")
-    @ApiModelProperty(value = "行政区名")
-    @Size(min  = 1, max = 50, message = "{行政区名}")
-    private String name;
-
-    /** 上级行政区 */
-    @Excel(name = "上级行政区")
-    @ApiModelProperty(value = "上级行政区")
-    private String parentId;
-
-    /** 等级 */
-    @Excel(name = "等级")
-    @ApiModelProperty(value = "等级")
-    @NumberV(message = "{等级}")
-    private String level;
-
-    /** 上级行政名称 */
-    private String parentName;
-
-}

ruoyi-modules/mz-business/src/main/resources/mapper/business/YljgBmxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.YljgBmxxMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgBmxx" id="YljgBmxxResult">
+    <resultMap type="YljgBmxx" id="YljgBmxxResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="zzmc"    column="zzmc"    />
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
     </sql>
 
-    <select id="selectYljgBmxxList" parameterType="com.ruoyi.organization.domain.YljgBmxx" resultMap="YljgBmxxResult">
+    <select id="selectYljgBmxxList" parameterType="YljgBmxx" resultMap="YljgBmxxResult">
         <include refid="selectYljgBmxxVo"/>
         <where>
             <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgBmxx" parameterType="com.ruoyi.organization.domain.YljgBmxx">
+    <insert id="insertYljgBmxx" parameterType="YljgBmxx">
         insert into yljg_bmxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgBmxx" parameterType="com.ruoyi.organization.domain.YljgBmxx">
+    <update id="updateYljgBmxx" parameterType="YljgBmxx">
         update yljg_bmxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="zzmc != null and zzmc != ''">zzmc = #{zzmc},</if>

ruoyi-modules/mz-business/src/main/resources/mapper/business/YljgJcxmxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.YljgJcxmxxMapper">
 
-    <resultMap type="com.ruoyi.business.domain.YljgJcxmxx" id="YljgJcxmxxResult">
+    <resultMap type="YljgJcxmxx" id="YljgJcxmxxResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="xfaqzcxxId"    column="xfaqzcxx_id"    />
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, xfaqzcxx_id, zbxh, zbgz, jcfs, zbxz, daxx, is_sf, is_upload, jcxx, bwsdjtqk, sm, zgcs, fzr, zgwcsx, is_wczg, wczfsj, zgwcqk, fj, create_time_str, create_user_id, create_by, create_unit, create_unit_name, update_time_str, update_user_id, update_by, update_unit, update_unit_name, state from yljg_jcxmxx
     </sql>
 
-    <select id="selectYljgJcxmxxList" parameterType="com.ruoyi.business.domain.YljgJcxmxx" resultMap="YljgJcxmxxResult">
+    <select id="selectYljgJcxmxxList" parameterType="YljgJcxmxx" resultMap="YljgJcxmxxResult">
         <include refid="selectYljgJcxmxxVo"/>
         <where>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertYljgJcxmxx" parameterType="com.ruoyi.business.domain.YljgJcxmxx">
+    <insert id="insertYljgJcxmxx" parameterType="YljgJcxmxx">
         insert into yljg_jcxmxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgJcxmxx" parameterType="com.ruoyi.business.domain.YljgJcxmxx">
+    <update id="updateYljgJcxmxx" parameterType="YljgJcxmxx">
         update yljg_jcxmxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="xfaqzcxxId != null and xfaqzcxxId != ''">xfaqzcxx_id = #{xfaqzcxxId},</if>

ruoyi-modules/mz-business/src/main/resources/mapper/business/YljgKhChxxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.YljgKhChxxxMapper">
 
-    <resultMap type="com.ruoyi.business.domain.YljgKhChxxx" id="YljgKhChxxxResult">
+    <resultMap type="YljgKhChxxx" id="YljgKhChxxxResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="khId"    column="kh_id"    />
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN yljg_kh_jbxx b ON b.id = a.kh_id
     </sql>
 
-    <select id="selectYljgKhChxxxList" parameterType="com.ruoyi.business.domain.YljgKhChxxx" resultMap="YljgKhChxxxResult">
+    <select id="selectYljgKhChxxxList" parameterType="YljgKhChxxx" resultMap="YljgKhChxxxResult">
         <include refid="selectKhChxxxVo"/>
         <where>
             <if test="jgId != null and jgId != ''"> and a.jg_id = #{jgId}</if>

ruoyi-modules/mz-business/src/main/resources/mapper/business/YljgQtaqzcMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.YljgQtaqzcMapper">
 
-    <resultMap type="com.ruoyi.business.domain.YljgQtaqzc" id="YljgQtaqzcResult">
+    <resultMap type="YljgQtaqzc" id="YljgQtaqzcResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="isCzwt"    column="is_czwt"    />
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--        LEFT JOIN sys_dept_jl c ON c.code = b.szxzqh-->
 <!--    </sql>-->
 
-    <select id="selectYljgQtaqzcListByGroupId" parameterType="com.ruoyi.business.domain.YljgQtaqzc" resultMap="YljgQtaqzcResult" >
+    <select id="selectYljgQtaqzcListByGroupId" parameterType="YljgQtaqzc" resultMap="YljgQtaqzcResult" >
         SELECT
         getxzqhmcbycode(b.szxzqh) szxzqh_name,
         getxzqhmcbycode(b.ssxzqh) ssxzqh_name,
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectYljgQtaqzcList" parameterType="com.ruoyi.business.domain.YljgQtaqzc" resultMap="YljgQtaqzcResult" >
+    <select id="selectYljgQtaqzcList" parameterType="YljgQtaqzc" resultMap="YljgQtaqzcResult" >
         SELECT
         b.jgmc, b.tyshxydm, b.txdz, c.name as szqh,
         a.id, a.jg_id, a.is_czwt, a.wtlx,  a.fxwt, a.zgcs, a.zgsx,
@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY a.create_time_str ASC
     </select>
 
-    <select id="selectYljgQtaqjcList" parameterType="com.ruoyi.business.domain.YljgQtaqzc" resultMap="YljgQtaqzcResult" >
+    <select id="selectYljgQtaqjcList" parameterType="YljgQtaqzc" resultMap="YljgQtaqzcResult" >
         SELECT
         b.jgmc, b.tyshxydm, b.txdz, c.name as szqh,
         a.id, a.jg_id, a.is_czwt, a.wtlx,  a.fxwt, a.zgcs, a.zgsx,

ruoyi-modules/mz-business/src/main/resources/mapper/business/YljgRzlhMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.YljgRzlhMapper">
 
-    <resultMap type="com.ruoyi.business.domain.YljgRzlh" id="YljgRzlhResult">
+    <resultMap type="YljgRzlh" id="YljgRzlhResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="jgyyId"    column="jgyy_id"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		LEFT JOIN yljg_jcxx b ON b.id = a.jg_id
     </sql>
 
-    <select id="selectYljgRzlhList" parameterType="com.ruoyi.business.domain.YljgRzlh" resultMap="YljgRzlhResult">
+    <select id="selectYljgRzlhList" parameterType="YljgRzlh" resultMap="YljgRzlhResult">
         <include refid="selectYljgRzlhVo"/>
         <where>
             <if test="xm != null  and xm != ''"> and a.xm like concat('%', #{xm}, '%')</if>
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgRzlh" parameterType="com.ruoyi.business.domain.YljgRzlh">
+    <insert id="insertYljgRzlh" parameterType="YljgRzlh">
         insert into yljg_rzlh
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgRzlh" parameterType="com.ruoyi.business.domain.YljgRzlh">
+    <update id="updateYljgRzlh" parameterType="YljgRzlh">
         update yljg_rzlh
         <trim prefix="SET" suffixOverrides=",">
             <if test="xm != null">xm = #{xm},</if>

ruoyi-modules/mz-business/src/main/resources/mapper/business/YljgXfaqzcxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.YljgXfaqzcxxMapper">
 
-    <resultMap type="com.ruoyi.business.domain.YljgXfaqzcxx" id="YljgXfaqzcxxResult">
+    <resultMap type="YljgXfaqzcxx" id="YljgXfaqzcxxResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="xfaqfzr"    column="xfaqfzr"    />
@@ -50,11 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isJc"    column="is_jc"    />
     </resultMap>
 
-    <resultMap id="YljgXfaqzcxxYljgJcxmxxResult" type="com.ruoyi.business.domain.YljgXfaqzcxx" extends="YljgXfaqzcxxResult">
+    <resultMap id="YljgXfaqzcxxYljgJcxmxxResult" type="YljgXfaqzcxx" extends="YljgXfaqzcxxResult">
         <collection property="yljgJcxmxxList" notNullColumn="sub_id" javaType="java.util.List" resultMap="YljgJcxmxxResult" />
     </resultMap>
 
-    <resultMap type="com.ruoyi.business.domain.YljgJcxmxx" id="YljgJcxmxxResult">
+    <resultMap type="YljgJcxmxx" id="YljgJcxmxxResult">
         <result property="id"    column="sub_id"    />
         <result property="xfaqzcxxId"    column="sub_xfaqzcxx_id"    />
         <result property="zbxh"    column="sub_zbxh"    />
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
     </sql>
 
-    <select id="selectYljgXfaqjcxxList" parameterType="com.ruoyi.business.domain.YljgXfaqzcxx" resultMap="YljgXfaqzcxxResult">
+    <select id="selectYljgXfaqjcxxList" parameterType="YljgXfaqzcxx" resultMap="YljgXfaqzcxxResult">
         SELECT
         b.tyshxydm ,b.jgmc,
         (
@@ -165,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <!--政务业务-综合监管-消防安全自查-->
-    <select id="selectYljgXfaqzcxxListByJgIdGroup" parameterType="com.ruoyi.business.domain.YljgXfaqzcxx" resultMap="YljgXfaqzcxxResult">
+    <select id="selectYljgXfaqzcxxListByJgIdGroup" parameterType="YljgXfaqzcxx" resultMap="YljgXfaqzcxxResult">
         SELECT
         b.tyshxydm, b.jgmc, b.szxzqh, a.create_time_str, a.id, a.jg_id, a.is_jgxfaqdbgc,
         a.xfaqfzr, a.xfaqfzrzjlx, a.xfaqfzrzjhm, a.xfaqfzrdh, a.xfaqglr, a.xfaqglrzjlx, a.is_jc,
@@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY a.create_time_str DESC
     </select>
 
-    <select id="selectYljgXfaqzcxxList" parameterType="com.ruoyi.business.domain.YljgXfaqzcxx" resultMap="YljgXfaqzcxxResult">
+    <select id="selectYljgXfaqzcxxList" parameterType="YljgXfaqzcxx" resultMap="YljgXfaqzcxxResult">
         <include refid="selectYljgXfaqzcxxVo"/>
         <where>
             <if test="szxzqh != null  and szxzqh != ''"> and b.szxzqh like concat( #{szxzqh}, '%')</if>
@@ -242,7 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY CONVERT(b.zbxh,SIGNED) ASC
     </select>
 
-    <insert id="insertYljgXfaqzcxx" parameterType="com.ruoyi.business.domain.YljgXfaqzcxx">
+    <insert id="insertYljgXfaqzcxx" parameterType="YljgXfaqzcxx">
         insert into yljg_xfaqzcxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -306,7 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgXfaqzcxx" parameterType="com.ruoyi.business.domain.YljgXfaqzcxx">
+    <update id="updateYljgXfaqzcxx" parameterType="YljgXfaqzcxx">
         update yljg_xfaqzcxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="jgId != null and jgId != ''">jg_id = #{jgId},</if>

ruoyi-modules/mz-business/src/main/resources/mapper/business/ZwywJgBnMapper.xml

@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
-    <select id="selectZwywBnListById" parameterType="com.ruoyi.business.domain.ZwywJgBn" resultMap="ZwywJgBnResult">
+    <select id="selectZwywBnListById" parameterType="ZwywJgBn" resultMap="ZwywJgBnResult">
         SELECT
         getxzqhcodebycode(szxzqh) ssxzqh_ids,
         getxzqhmcbycode(ssxzqh) ssxzqh_name,
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectZwywBnList" parameterType="com.ruoyi.business.domain.ZwywJgBn" resultMap="ZwywJgBnResult">
+    <select id="selectZwywBnList" parameterType="ZwywJgBn" resultMap="ZwywJgBnResult">
         SELECT
         getxzqhmcbycode(b.szxzqh) szxzqh_name,a.*
         FROM zwyw_jg_bn a
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectJgZwywBnList" parameterType="com.ruoyi.business.domain.ZwywJgBn" resultMap="ZwywJgBnResult">
+    <select id="selectJgZwywBnList" parameterType="ZwywJgBn" resultMap="ZwywJgBnResult">
         SELECT
         getxzqhmcbycode(b.szxzqh) szxzqh_name,a.*
         FROM zwyw_jg_bn a
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectZwywBnListByLzzt" parameterType="com.ruoyi.business.domain.ZwywJgBn" resultMap="ZwywJgBnResult">
+    <select id="selectZwywBnListByLzzt" parameterType="ZwywJgBn" resultMap="ZwywJgBnResult">
         SELECT * FROM
         zwyw_jg_bn
         <where>

ruoyi-modules/mz-business/src/main/resources/mapper/business/ZwywJgFwjcMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.ZwywJgFwjcMapper">
 
-    <resultMap type="com.ruoyi.business.domain.ZwywJgFwjc" id="ZwywJgFwjcResult">
+    <resultMap type="ZwywJgFwjc" id="ZwywJgFwjcResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="jcCs"    column="jc_cs"    />
@@ -35,11 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="yljglx"    column="yljglx"    />
     </resultMap>
 
-    <resultMap id="ZwywJgFwjcZwywJgFwjcJcxxResult" type="com.ruoyi.business.domain.ZwywJgFwjc" extends="ZwywJgFwjcResult">
+    <resultMap id="ZwywJgFwjcZwywJgFwjcJcxxResult" type="ZwywJgFwjc" extends="ZwywJgFwjcResult">
         <collection property="zwywJgFwjcJcxxList" notNullColumn="sub_id" javaType="java.util.List" resultMap="ZwywJgFwjcJcxxResult" />
     </resultMap>
 
-    <resultMap type="com.ruoyi.business.domain.ZwywJgFwjcJcxx" id="ZwywJgFwjcJcxxResult">
+    <resultMap type="ZwywJgFwjcJcxx" id="ZwywJgFwjcJcxxResult">
         <result property="id"    column="sub_id"    />
         <result property="fwjcId"    column="sub_fwjc_id"    />
         <result property="zbXh"    column="sub_zb_xh"    />
@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectZwywJgFwjcList" parameterType="com.ruoyi.business.domain.ZwywJgFwjc" resultMap="ZwywJgFwjcResult">
+    <select id="selectZwywJgFwjcList" parameterType="ZwywJgFwjc" resultMap="ZwywJgFwjcResult">
         SELECT
         get_yljg_jglx(b.dwxz,b.frlx) as yljglx,
         b.jgmc , getxzqhmcbycode(b.ssxzqh) as ssxzqh_name,
@@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectZwywJgFwjcByJcCs" parameterType="com.ruoyi.business.domain.ZwywJgFwjc" resultMap="ZwywJgFwjcZwywJgFwjcJcxxResult">
+    <select id="selectZwywJgFwjcByJcCs" parameterType="ZwywJgFwjc" resultMap="ZwywJgFwjcZwywJgFwjcJcxxResult">
         SELECT
         a.id, a.jg_id, a.jc_cs, a.tmsydx, a.zt, a.is_last, a.shjg, a.shjy,
         b.id as sub_id, b.fwjc_id as sub_fwjc_id, b.zb_xh as sub_zb_xh, b.jc_mc as sub_jc_mc, b.is_zdx as sub_is_zdx,
@@ -258,7 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ON AA.ssxzqh4 = BB.ssxzqh
     </select>
 
-    <select id="selectFwjcMsgByJgId" parameterType="com.ruoyi.business.domain.ZwywJgFwjc" resultType="java.util.HashMap">
+    <select id="selectFwjcMsgByJgId" parameterType="ZwywJgFwjc" resultType="java.util.HashMap">
         SELECT
         a.id, a.jc_cs as jcCs, a.zt, a.is_last, a.shsj,
         b.jgmc , getxzqhmcbycode(b.ssxzqh) as ssxzqh_name,

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgBmxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgBmxxMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgBmxx" id="YljgBmxxResult">
+    <resultMap type="YljgBmxx" id="YljgBmxxResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="zzmc"    column="zzmc"    />
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
     </sql>
 
-    <select id="selectYljgBmxxList" parameterType="com.ruoyi.organization.domain.YljgBmxx" resultMap="YljgBmxxResult">
+    <select id="selectYljgBmxxList" parameterType="YljgBmxx" resultMap="YljgBmxxResult">
         <include refid="selectYljgBmxxVo"/>
         <where>
             <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgBmxx" parameterType="com.ruoyi.organization.domain.YljgBmxx">
+    <insert id="insertYljgBmxx" parameterType="YljgBmxx">
         insert into yljg_bmxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgBmxx" parameterType="com.ruoyi.organization.domain.YljgBmxx">
+    <update id="updateYljgBmxx" parameterType="YljgBmxx">
         update yljg_bmxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="zzmc != null and zzmc != ''">zzmc = #{zzmc},</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgFwcdCwMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgFwcdCwMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgFwcdCw" id="YljgFwcdCwResult">
+    <resultMap type="YljgFwcdCw" id="YljgFwcdCwResult">
         <result property="id"    column="id"    />
         <result property="fjId"    column="fj_id"    />
         <result property="jgId"    column="jg_id"    />
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_fwcd_ly d ON c.ly_id = d.id
     </sql>
 
-    <select id="selectYljgFwcdCwList" parameterType="com.ruoyi.organization.domain.YljgFwcdCw" resultMap="YljgFwcdCwResult">
+    <select id="selectYljgFwcdCwList" parameterType="YljgFwcdCw" resultMap="YljgFwcdCwResult">
         <include refid="selectYljgFwcdCwVo"/>
         <where>
             <if test="id != null  and id != ''"> and a.id = #{id}</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgFwcdCw" parameterType="com.ruoyi.organization.domain.YljgFwcdCw">
+    <insert id="insertYljgFwcdCw" parameterType="YljgFwcdCw">
         insert into yljg_fwcd_cw
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgFwcdCw" parameterType="com.ruoyi.organization.domain.YljgFwcdCw">
+    <update id="updateYljgFwcdCw" parameterType="YljgFwcdCw">
         update yljg_fwcd_cw
         <trim prefix="SET" suffixOverrides=",">
             <if test="fjId != null and fjId != ''">fj_id = #{fjId},</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgFwcdFjMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgFwcdFjMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgFwcdFj" id="YljgFwcdFjResult">
+    <resultMap type="YljgFwcdFj" id="YljgFwcdFjResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="lcId"    column="lc_id"    />
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_fwcd_ly c ON b.ly_id = c.id
     </sql>
 
-    <select id="selectYljgFwcdFjList" parameterType="com.ruoyi.organization.domain.YljgFwcdFj" resultMap="YljgFwcdFjResult">
+    <select id="selectYljgFwcdFjList" parameterType="YljgFwcdFj" resultMap="YljgFwcdFjResult">
         <include refid="selectYljgFwcdFjVo"/>
         <where>
             <if test="id != null  and id != ''"> and a.id = #{id}</if>
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY a.create_time_str ASC
     </select>
 
-    <select id="checkRepeat" parameterType="com.ruoyi.organization.domain.YljgFwcdFj" resultMap="YljgFwcdFjResult">
+    <select id="checkRepeat" parameterType="YljgFwcdFj" resultMap="YljgFwcdFjResult">
         <include refid="selectYljgFwcdFjVo"/>
         <where>
             <if test="lcId != null  and lcId != ''"> and a.lc_id = #{lcId}</if>
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgFwcdFj" parameterType="com.ruoyi.organization.domain.YljgFwcdFj">
+    <insert id="insertYljgFwcdFj" parameterType="YljgFwcdFj">
         insert into yljg_fwcd_fj
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgFwcdFj" parameterType="com.ruoyi.organization.domain.YljgFwcdFj">
+    <update id="updateYljgFwcdFj" parameterType="YljgFwcdFj">
         update yljg_fwcd_fj
         <trim prefix="SET" suffixOverrides=",">
             <if test="lcId != null and lcId != ''">lc_id = #{lcId},</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgFwcdLcMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgFwcdLcMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgFwcdLc" id="YljgFwcdLcResult">
+    <resultMap type="YljgFwcdLc" id="YljgFwcdLcResult">
         <result property="id"    column="id"    />
         <result property="lyId"    column="ly_id"    />
         <result property="jgId"    column="jg_id"    />
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_fwcd_ly b ON a.ly_id = b.id
     </sql>
 
-    <select id="selectYljgFwcdLcList" parameterType="com.ruoyi.organization.domain.YljgFwcdLc" resultMap="YljgFwcdLcResult">
+    <select id="selectYljgFwcdLcList" parameterType="YljgFwcdLc" resultMap="YljgFwcdLcResult">
         <include refid="selectYljgFwcdLcVo"/>
         <where>
             <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="cheakRepeat" parameterType="com.ruoyi.organization.domain.YljgFwcdLc" resultMap="YljgFwcdLcResult">
+    <select id="cheakRepeat" parameterType="YljgFwcdLc" resultMap="YljgFwcdLcResult">
         <include refid="selectYljgFwcdLcVo"/>
         <where>
             <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgFwcdLc" parameterType="com.ruoyi.organization.domain.YljgFwcdLc">
+    <insert id="insertYljgFwcdLc" parameterType="YljgFwcdLc">
         insert into yljg_fwcd_lc
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgFwcdLc" parameterType="com.ruoyi.organization.domain.YljgFwcdLc">
+    <update id="updateYljgFwcdLc" parameterType="YljgFwcdLc">
         update yljg_fwcd_lc
         <trim prefix="SET" suffixOverrides=",">
             <if test="lyId != null and lyId != ''">ly_id = #{lyId},</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgFwcdLyMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgFwcdLyMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgFwcdLy" id="YljgFwcdLyResult">
+    <resultMap type="YljgFwcdLy" id="YljgFwcdLyResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="lymc"    column="lymc"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, jg_id, lymc, zl, lyzt, create_time_str, create_user_id, create_by, create_unit, create_unit_name, update_time_str, update_user_id, update_by, update_unit, update_unit_name, state from yljg_fwcd_ly
     </sql>
 
-    <select id="selectYljgFwcdLyList" parameterType="com.ruoyi.organization.domain.YljgFwcdLy" resultMap="YljgFwcdLyResult">
+    <select id="selectYljgFwcdLyList" parameterType="YljgFwcdLy" resultMap="YljgFwcdLyResult">
         <include refid="selectYljgFwcdLyVo"/>
         <where>
             <if test="lymc != null  and lymc != ''"> and lymc like concat('%', #{lymc}, '%')</if>
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="cheakRepeat" parameterType="com.ruoyi.organization.domain.YljgFwcdLy" resultMap="YljgFwcdLyResult">
+    <select id="cheakRepeat" parameterType="YljgFwcdLy" resultMap="YljgFwcdLyResult">
         <include refid="selectYljgFwcdLyVo"/>
         <where>
             <if test="lymc != null  and lymc != ''"> and lymc = #{lymc}</if>
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertYljgFwcdLy" parameterType="com.ruoyi.organization.domain.YljgFwcdLy">
+    <insert id="insertYljgFwcdLy" parameterType="YljgFwcdLy">
         insert into yljg_fwcd_ly
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgFwcdLy" parameterType="com.ruoyi.organization.domain.YljgFwcdLy">
+    <update id="updateYljgFwcdLy" parameterType="YljgFwcdLy">
         update yljg_fwcd_ly
         <trim prefix="SET" suffixOverrides=",">
             <if test="jgId != null and jgId != ''">jg_id = #{jgId},</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgLrypMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgLrypMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgLryp" id="YljgLrypResult">
+    <resultMap type="YljgLryp" id="YljgLrypResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="lrypmc"    column="lrypmc"    />
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljgsq_jcxx c ON a.jg_id = c.id
     </sql>
 
-    <select id="selectYljgLrypList" parameterType="com.ruoyi.organization.domain.YljgLryp" resultMap="YljgLrypResult">
+    <select id="selectYljgLrypList" parameterType="YljgLryp" resultMap="YljgLrypResult">
         <include refid="selectYljgLrypVo"/>
         <where>
             <if test="tyshxydm != null and tyshxydm != ''"> and IFNULL(b.tyshxydm, c.tyshxydm) like concat('%', #{tyshxydm}, '%')</if>
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgLryp" parameterType="com.ruoyi.organization.domain.YljgLryp">
+    <insert id="insertYljgLryp" parameterType="YljgLryp">
         insert into yljg_lryp
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgLryp" parameterType="com.ruoyi.organization.domain.YljgLryp">
+    <update id="updateYljgLryp" parameterType="YljgLryp">
         update yljg_lryp
         <trim prefix="SET" suffixOverrides=",">
             <if test="jgId != null">jg_id = #{jgId},</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgSssbMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgSssbMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgSssb" id="YljgSssbResult">
+    <resultMap type="YljgSssb" id="YljgSssbResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="sssblx"    column="sssblx"    />
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
     </sql>
 
-    <select id="selectYljgSssbList" parameterType="com.ruoyi.organization.domain.YljgSssb" resultMap="YljgSssbResult">
+    <select id="selectYljgSssbList" parameterType="YljgSssb" resultMap="YljgSssbResult">
         <include refid="selectYljgSssbVo"/>
         <where>
             <if test="xzqhId != null  and xzqhId != ''"> and b.szxzqh like concat( #{xzqhId}, '%')</if>
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgSssb" parameterType="com.ruoyi.organization.domain.YljgSssb">
+    <insert id="insertYljgSssb" parameterType="YljgSssb">
         insert into yljg_sssb
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgSssb" parameterType="com.ruoyi.organization.domain.YljgSssb">
+    <update id="updateYljgSssb" parameterType="YljgSssb">
         update yljg_sssb
         <trim prefix="SET" suffixOverrides=",">
             <if test="sssblx != null and sssblx != ''">sssblx = #{sssblx},</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgYjyaMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgYjyaMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgYjya" id="YljgYjyaResult">
+    <resultMap type="YljgYjya" id="YljgYjyaResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="yjyalb"    column="yjyalb"    />
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
     </sql>
 
-    <select id="selectYljgYjyaList" parameterType="com.ruoyi.organization.domain.YljgYjya" resultMap="YljgYjyaResult">
+    <select id="selectYljgYjyaList" parameterType="YljgYjya" resultMap="YljgYjyaResult">
         <include refid="selectYljgYjyaVo"/>
         <where>
             <if test="szxzqh != null  and szxzqh != ''"> and b.szxzqh like concat( #{szxzqh}, '%')</if>
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <insert id="insertYljgYjya" parameterType="com.ruoyi.organization.domain.YljgYjya">
+    <insert id="insertYljgYjya" parameterType="YljgYjya">
         insert into yljg_yjya
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgYjya" parameterType="com.ruoyi.organization.domain.YljgYjya">
+    <update id="updateYljgYjya" parameterType="YljgYjya">
         update yljg_yjya
         <trim prefix="SET" suffixOverrides=",">
             <if test="jgId != null">jg_id = #{jgId},</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgZdsjMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgZdsjMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgZdsj" id="YljgZdsjResult">
+    <resultMap type="YljgZdsj" id="YljgZdsjResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="sjzt"    column="sjzt"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
     </sql>
 
-    <select id="selectYljgZdsjList" parameterType="com.ruoyi.organization.domain.YljgZdsj" resultMap="YljgZdsjResult">
+    <select id="selectYljgZdsjList" parameterType="YljgZdsj" resultMap="YljgZdsjResult">
         <include refid="selectYljgZdsjVo"/>
         <where>
             <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgZrbxxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgZrbxxxMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgZrbxxx" id="YljgZrbxxxResult">
+    <resultMap type="YljgZrbxxx" id="YljgZrbxxxResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="tbbxmc"    column="tbbxmc"    />
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
     </sql>
 
-    <select id="selectYljgZrbxxxList" parameterType="com.ruoyi.organization.domain.YljgZrbxxx" resultMap="YljgZrbxxxResult">
+    <select id="selectYljgZrbxxxList" parameterType="YljgZrbxxx" resultMap="YljgZrbxxxResult">
         <include refid="selectYljgZrbxxxVo"/>
         <where>
             <if test="szxzqh != null  and szxzqh != ''"> and b.szxzqh like concat( #{szxzqh}, '%')</if>
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgZrbxxx" parameterType="com.ruoyi.organization.domain.YljgZrbxxx">
+    <insert id="insertYljgZrbxxx" parameterType="YljgZrbxxx">
         insert into yljg_zrbxxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgZrbxxx" parameterType="com.ruoyi.organization.domain.YljgZrbxxx">
+    <update id="updateYljgZrbxxx" parameterType="YljgZrbxxx">
         update yljg_zrbxxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="jgId != null and jgId != ''">jg_id = #{jgId},</if>

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgsqJcxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.organization.mapper.YljgsqJcxxMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgsqJcxx" id="YljgsqJcxxResult">
+    <resultMap type="YljgsqJcxx" id="YljgsqJcxxResult">
         <result property="id"    column="id"    />
         <result property="zzjgdm"    column="zzjgdm"    />
         <result property="tyshxydm"    column="tyshxydm"    />
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from yljgsq_jcxx
     </sql>
 
-    <select id="selectYljgsqJcxxList" parameterType="com.ruoyi.organization.domain.YljgsqJcxx" resultMap="YljgsqJcxxResult">
+    <select id="selectYljgsqJcxxList" parameterType="YljgsqJcxx" resultMap="YljgsqJcxxResult">
         <include refid="selectYljgsqJcxxVo"/>
         <where>
             <if test="xzqhId != null  and xzqhId != ''"> and szxzqh like concat( #{xzqhId}, '%')</if>
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertYljgsqJcxx" parameterType="com.ruoyi.organization.domain.YljgsqJcxx">
+    <insert id="insertYljgsqJcxx" parameterType="YljgsqJcxx">
         insert into yljgsq_jcxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -342,7 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgsqJcxx" parameterType="com.ruoyi.organization.domain.YljgsqJcxx">
+    <update id="updateYljgsqJcxx" parameterType="YljgsqJcxx">
         update yljgsq_jcxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="tyshxydm != null">tyshxydm = #{tyshxydm},</if>
@@ -426,7 +426,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <update id="updateYljgsqJcxxZH" parameterType="com.ruoyi.organization.domain.YljgsqJcxx">
+    <update id="updateYljgsqJcxxZH" parameterType="YljgsqJcxx">
         update yljgsq_jcxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="tyshxydm != null">tyshxydm = #{tyshxydm},</if>
@@ -444,7 +444,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
 
-    <update id="updateYljgsqSczt" parameterType="com.ruoyi.organization.domain.YljgsqJcxx">
+    <update id="updateYljgsqSczt" parameterType="YljgsqJcxx">
         update yljgsq_jcxx SET sczt = #{sczt}
         where id = #{id}
     </update>
@@ -469,7 +469,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT COUNT(*) FROM yljgsq_jcxx
     </select>
 
-    <select id="selectSqYljgZhxxList" parameterType="com.ruoyi.organization.domain.YljgsqJcxx" resultType="java.util.HashMap">
+    <select id="selectSqYljgZhxxList" parameterType="YljgsqJcxx" resultType="java.util.HashMap">
         SELECT
         a.id, a.tyshxydm, a.jgmc, a.ssxzqh, a.frxm, a.frlxfs, a.create_unit,
         CASE WHEN b.user_id IS NULL THEN '02' WHEN a.sczt = '07' THEN '03' WHEN a.sczt in('01','04','05','06') THEN '01' END AS `status`,
@@ -506,7 +506,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <update id="updateYljgSqJcxxZtById" parameterType="com.ruoyi.organization.domain.YljgsqJcxx">
+    <update id="updateYljgSqJcxxZtById" parameterType="YljgsqJcxx">
         update yljgsq_jcxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="sczt != null and sczt != ''">sczt = #{sczt},</if>
@@ -522,7 +522,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <select id="selectJgByXydm" parameterType="com.ruoyi.organization.domain.YljgsqJcxx" resultMap="YljgsqJcxxResult">
+    <select id="selectJgByXydm" parameterType="YljgsqJcxx" resultMap="YljgsqJcxxResult">
         SELECT
         *
         FROM

ruoyi-modules/mz-organization-rcyy/src/main/resources/mapper/business/YljgJzxxMapper.xml

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
-    <select id="selectYljgJzxxList" parameterType="com.ruoyi.organization.domain.YljgJzxx" resultMap="YljgJzxxResult">
+    <select id="selectYljgJzxxList" parameterType="YljgJzxx" resultMap="YljgJzxxResult">
         select
         b.jgmc, b.tyshxydm, getxzqhmcbycode(b.szxzqh) szxzqh_name, b.txdz, a.*
         from yljg_jzxx a

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgJbxxMapper.xml

@@ -233,7 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN yljg_bmxx c ON a.shbn = c.id
     </sql>
 
-    <select id="selectYljgYgJbxxListBuss" parameterType="com.ruoyi.organization.domain.YljgYgJbxx" resultMap="YljgYgJbxxResult">
+    <select id="selectYljgYgJbxxListBuss" parameterType="YljgYgJbxx" resultMap="YljgYgJbxxResult">
         <include refid="selectYljgYgJbxxBussVo"/>
         <where>
             a.create_user_type = '01'
@@ -259,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         --         ORDER BY a.create_time_str DESC
     </select>
 
-    <select id="selectSqYljgYgJbxxListBuss" parameterType="com.ruoyi.organization.domain.YljgYgJbxx" resultMap="YljgYgJbxxResult">
+    <select id="selectSqYljgYgJbxxListBuss" parameterType="YljgYgJbxx" resultMap="YljgYgJbxxResult">
         <include refid="selectYljgYgJbxxBussVo"/>
         <where>
             a.create_user_type = '02'

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/domain/SysZbgz.java

@@ -1,90 +0,0 @@
-package com.ruoyi.organization.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 服务质量检查指标配置对象 sys_zbgz
- *
- * @author CH
- * @date 2022-04-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@TableName("sys_zbgz")
-@ApiModel("服务质量检查指标配置对象")
-public class SysZbgz extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 编号 */
-    @ApiModelProperty(value = "编号")
-    @TableId(value = "id",type = IdType.AUTO)
-    private String id;
-
-    /** 序号 */
-    @ApiModelProperty(value = "序号")
-    @Excel(name = "序号")
-    private Integer xh;
-
-    /** 选择否时,是否上传附件(0：否 1：是) */
-    @ApiModelProperty(value = "选择否时,是否上传附件(0：否 1：是)")
-    @Excel(name = "选择否时,是否上传附件")
-    private String isUpload;
-
-    /** 检查条款 */
-    @ApiModelProperty(value = "检查条款")
-    @Excel(name = "检查条款")
-    private String jctk;
-
-    /** 指标内容 */
-    @ApiModelProperty(value = "指标内容")
-    @Excel(name = "指标内容")
-    private String zbnr;
-
-    /** 指标细则 */
-    @ApiModelProperty(value = "指标细则")
-    @Excel(name = "指标细则")
-    private String zbxz;
-
-    /** 检查方式 */
-    @ApiModelProperty(value = "检查方式")
-    @Excel(name = "检查方式")
-    private String jcfs;
-
-    /** 是否为重点指标项 */
-    @ApiModelProperty(value = "是否为重点指标项")
-    @Excel(name = "是否为重点指标项")
-    private String isZdx;
-
-    /** 题目适用对象 */
-    @ApiModelProperty(value = "题目适用对象")
-    @Excel(name = "题目适用对象")
-    private String tmsydx;
-
-    /** 题目答案配置 */
-    @ApiModelProperty(value = "题目答案配置")
-    @Excel(name = "题目答案配置")
-    private String tmdnpz;
-
-
-    /** 答案信息 */
-    @ApiModelProperty(value = "答案信息")
-    @Excel(name = "答案信息")
-    private String daxx;
-
-    /** 状态(0：停用 1：启用) */
-    @ApiModelProperty(value = "状态(0：停用 1：启用)")
-    @Excel(name = "状态")
-    private String zt;
-
-}

ruoyi-modules/mz-portal/pom.xml

@@ -87,8 +87,7 @@
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-modules-organization-yggl</artifactId>
-            <version>3.6.0</version>
-            <scope>compile</scope>
+            <version>${ruoyi.version}</version>
         </dependency>
 
     </dependencies>

ruoyi-modules/mz-portal/src/main/resources/mapper/portal/MhZcXwMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="state"    column="state"    />
     </resultMap>
 
-    <resultMap type="com.ruoyi.organization.domain.YljgJcxx" id="YljgJcxxResult">
+    <resultMap type="YljgJcxx" id="YljgJcxxResult">
         <result property="id"    column="id"    />
         <result property="zzjgdm"    column="zzjgdm"    />
         <result property="tyshxydm"    column="tyshxydm"    />
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="szxzqhName"    column="szxzqh_name"    />
     </resultMap>
 
-    <select id="selectYljgxx" parameterType="com.ruoyi.organization.domain.YljgJcxx" resultMap="YljgJcxxResult">
+    <select id="selectYljgxx" parameterType="YljgJcxx" resultMap="YljgJcxxResult">
         getxzqhmcbycode(ssxzqh) as ssxzqh_name,
         getxzqhmcbycode(szxzqh) as szxzqh_name,
         id, zzjgdm, tyshxydm, jgmc, jlrq, czyy, czsj,
@@ -161,7 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <resultMap type="com.ruoyi.organization.domain.YljgsqJcxx" id="YljgsqJcxxResult">
+    <resultMap type="YljgsqJcxx" id="YljgsqJcxxResult">
         <result property="id"    column="id"    />
         <result property="zzjgdm"    column="zzjgdm"    />
         <result property="tyshxydm"    column="tyshxydm"    />
@@ -237,7 +237,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="szxzqhName"    column="szxzqh_name"    />
     </resultMap>
 
-    <select id="selectSqYljgxx" parameterType="com.ruoyi.organization.domain.YljgsqJcxx" resultMap="YljgsqJcxxResult">
+    <select id="selectSqYljgxx" parameterType="YljgsqJcxx" resultMap="YljgsqJcxxResult">
         select
         getxzqhmcbycode(szxzqh) as szxzqh_name,
         getxzqhmcbycode(ssxzqh) as ssxzqh_name,

ruoyi-modules/mz-portal/src/main/resources/mapper/portal/YljgJcxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.portal.mapper.YljgJcxxPortalMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgJcxx" id="YljgJcxxResult">
+    <resultMap type="YljgJcxx" id="YljgJcxxResult">
         <result property="id"    column="id"    />
         <result property="zzjgdm"    column="zzjgdm"    />
         <result property="tyshxydm"    column="tyshxydm"    />
@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             from yljg_jcxx
         </sql>
 
-    <select id="selectYljgAndYljgSqJcxxList" parameterType="com.ruoyi.organization.domain.YljgJcxx" resultMap="YljgJcxxResult">
+    <select id="selectYljgAndYljgSqJcxxList" parameterType="YljgJcxx" resultMap="YljgJcxxResult">
         select
         IFNULL((select pddj from zwyw_djpd_sq where jg_id = yljg_jcxx.id limit 1), '00') as pddj,
         getxzqhmcbycode(ssxzqh) as ssxzqh_name,
@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectYljgJcxxList" parameterType="com.ruoyi.organization.domain.YljgJcxx" resultMap="YljgJcxxResult">
+    <select id="selectYljgJcxxList" parameterType="YljgJcxx" resultMap="YljgJcxxResult">
         select
         IFNULL((select pddj from zwyw_djpd_sq where jg_id = yljg_jcxx.id limit 1), '00') as pddj,
         getxzqhmcbycode(ssxzqh) as ssxzqh_name,
@@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectYljgMapJcxxList" parameterType="com.ruoyi.organization.domain.YljgJcxx" resultType="java.util.HashMap">
+    <select id="selectYljgMapJcxxList" parameterType="YljgJcxx" resultType="java.util.HashMap">
         SELECT
             cwzs,
             jgmc,
@@ -226,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectYljgAndSqMapJcxxList" parameterType="com.ruoyi.organization.domain.YljgJcxx" resultType="java.util.HashMap">
+    <select id="selectYljgAndSqMapJcxxList" parameterType="YljgJcxx" resultType="java.util.HashMap">
         SELECT
             cwzs,
             jgmc,

ruoyi-modules/mz-portal/src/main/resources/mapper/portal/YljgYgJbxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.portal.mapper.YljgYgJbxxPortalMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgYgJbxx" id="YljgYgJbxxResult">
+    <resultMap type="YljgYgJbxx" id="YljgYgJbxxResult">
         <result property="id"    column="id"    />
         <result property="jgId"    column="jg_id"    />
         <result property="xm"    column="xm"    />
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--    LEFT JOIN yljg_bmxx d ON a.shbn = d.id-->
 <!--    </sql>-->
 
-    <select id="selectYljgYgJbxxList" parameterType="com.ruoyi.organization.domain.YljgYgJbxx" resultMap="YljgYgJbxxResult">
+    <select id="selectYljgYgJbxxList" parameterType="YljgYgJbxx" resultMap="YljgYgJbxxResult">
         <include refid="selectYljgYgJbxxVo"/>
         <where>
             <if test="xm != null  and xm != ''"> and a.xm like concat('%', #{xm}, '%')</if>
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 --         ORDER BY a.create_time_str DESC
     </select>
 
-    <select id="selectSqYljgYgJbxxList" parameterType="com.ruoyi.organization.domain.YljgYgJbxx" resultMap="YljgYgJbxxResult">
+    <select id="selectSqYljgYgJbxxList" parameterType="YljgYgJbxx" resultMap="YljgYgJbxxResult">
         <include refid="selectSqYljgYgJbxxVo"/>
         <where>
             a.create_user_type = '02'
@@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <select id="selectYljgHlyList" parameterType="com.ruoyi.organization.domain.YljgYgJbxx" resultType="java.util.Map">
+    <select id="selectYljgHlyList" parameterType="YljgYgJbxx" resultType="java.util.Map">
         SELECT
         xm AS xm,
         xb AS xb,

ruoyi-modules/mz-portal/src/main/resources/mapper/portal/YljgsqJcxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.portal.mapper.YljgsqJcxxPortalMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgsqJcxx" id="YljgsqJcxxResult">
+    <resultMap type="YljgsqJcxx" id="YljgsqJcxxResult">
         <result property="id"    column="id"    />
         <result property="zzjgdm"    column="zzjgdm"    />
         <result property="tyshxydm"    column="tyshxydm"    />
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from yljgsq_jcxx
     </sql>
 
-    <select id="selectYljgsqJcxxList" parameterType="com.ruoyi.organization.domain.YljgsqJcxx" resultMap="YljgsqJcxxResult">
+    <select id="selectYljgsqJcxxList" parameterType="YljgsqJcxx" resultMap="YljgsqJcxxResult">
         <include refid="selectYljgsqJcxxVo"/>
         <where>
             <if test="xzqhId != null  and xzqhId != ''"> and szxzqh like concat( #{xzqhId}, '%')</if>
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectYljgsqMapJcxxList" parameterType="com.ruoyi.organization.domain.YljgsqJcxx" resultType="java.util.HashMap">
+    <select id="selectYljgsqMapJcxxList" parameterType="YljgsqJcxx" resultType="java.util.HashMap">
         SELECT
             cwzs,
             jgmc,
@@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertYljgsqJcxx" parameterType="com.ruoyi.organization.domain.YljgsqJcxx">
+    <insert id="insertYljgsqJcxx" parameterType="YljgsqJcxx">
         insert into yljgsq_jcxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -294,7 +294,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgsqJcxx" parameterType="com.ruoyi.organization.domain.YljgsqJcxx">
+    <update id="updateYljgsqJcxx" parameterType="YljgsqJcxx">
         update yljgsq_jcxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="tyshxydm != null">tyshxydm = #{tyshxydm},</if>
@@ -363,7 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <update id="updateYljgSqJcxxZtById" parameterType="com.ruoyi.organization.domain.YljgsqJcxx">
+    <update id="updateYljgSqJcxxZtById" parameterType="YljgsqJcxx">
         update yljgsq_jcxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="sczt != null and sczt != ''">sczt = #{sczt},</if>
@@ -383,7 +383,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT COUNT(*) FROM yljgsq_jcxx
     </select>
 
-    <select id="selectJgByXydm" parameterType="com.ruoyi.organization.domain.YljgsqJcxx" resultMap="YljgsqJcxxResult">
+    <select id="selectJgByXydm" parameterType="YljgsqJcxx" resultMap="YljgsqJcxxResult">
         SELECT
         *
         FROM

ruoyi-modules/mz-search/pom.xml

@@ -86,8 +86,7 @@
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-modules-organization-jg</artifactId>
-            <version>3.6.0</version>
-            <scope>compile</scope>
+            <version>${ruoyi.version}</version>
         </dependency>
 
     </dependencies>

ruoyi-modules/mz-search/src/main/resources/mapper/business/YljgJcxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.mapper.YljgJcxxSearchMapper">
 
-    <resultMap type="com.ruoyi.organization.domain.YljgJcxx" id="YljgJcxxResult">
+    <resultMap type="YljgJcxx" id="YljgJcxxResult">
         <result property="id"    column="id"    />
         <result property="zzjgdm"    column="zzjgdm"    />
         <result property="tyshxydm"    column="tyshxydm"    />
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </sql>
 
 
-    <select id="selectYljgJcxxList" parameterType="com.ruoyi.organization.domain.YljgJcxx" resultMap="YljgJcxxResult">
+    <select id="selectYljgJcxxList" parameterType="YljgJcxx" resultMap="YljgJcxxResult">
         <include refid="selectYljgJcxxVo"/>
         <where>
             <if test="xzqhId != null  and xzqhId != ''"> and szxzqh like concat( #{xzqhId}, '%')</if>
@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectYljgJcxxFwjcList" parameterType="com.ruoyi.organization.domain.YljgJcxx" resultMap="YljgJcxxResult">
+    <select id="selectYljgJcxxFwjcList" parameterType="YljgJcxx" resultMap="YljgJcxxResult">
         select
         a.id, a.zzjgdm, a.tyshxydm, a.jgmc, a.txdz,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_unit_name,
@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <insert id="insertYljgJcxx" parameterType="com.ruoyi.organization.domain.YljgJcxx">
+    <insert id="insertYljgJcxx" parameterType="YljgJcxx">
         insert into yljg_jcxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -341,7 +341,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateYljgJcxx" parameterType="com.ruoyi.organization.domain.YljgJcxx">
+    <update id="updateYljgJcxx" parameterType="YljgJcxx">
         update yljg_jcxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="zzjgdm != null and zzjgdm != ''">zzjgdm = #{zzjgdm},</if>
@@ -435,12 +435,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <update id="updateYljgBaById" parameterType="com.ruoyi.organization.domain.YljgJcxx">
+    <update id="updateYljgBaById" parameterType="YljgJcxx">
         update yljg_jcxx set is_ba = 1
         where id = #{id}
     </update>
 
-    <update id="updateYljgJcxxZtById" parameterType="com.ruoyi.organization.domain.YljgJcxx">
+    <update id="updateYljgJcxxZtById" parameterType="YljgJcxx">
         update yljg_jcxx
         <trim prefix="SET" suffixOverrides=",">
             <if test="sczt != null and sczt != ''">sczt = #{sczt},</if>
@@ -472,7 +472,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 <!--    getxzqhmcbycode(szxzqh) as szxzqh_name,-->
 <!--    getxzqhmcbycode(ssxzqh) as ssxzqh_name,-->
-    <select id="selectJgByXydm" parameterType="com.ruoyi.organization.domain.YljgJcxx" resultMap="YljgJcxxResult">
+    <select id="selectJgByXydm" parameterType="YljgJcxx" resultMap="YljgJcxxResult">
         SELECT
         *
         FROM

ruoyi-modules/mz-system-ext/src/main/resources/mapper/system/SysDeptJlMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDeptJlMapper">
 
-    <resultMap type="com.ruoyi.system.domain.SysDeptJl" id="SysDeptJlResult">
+    <resultMap type="SysDeptJl" id="SysDeptJlResult">
         <result property="id"    column="id"    />
         <result property="code"    column="code"    />
         <result property="name"    column="name"    />
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectSysDeptJlList" parameterType="com.ruoyi.system.domain.SysDeptJl" resultMap="SysDeptJlResult">
+    <select id="selectSysDeptJlList" parameterType="SysDeptJl" resultMap="SysDeptJlResult">
         <include refid="selectSysDeptJlVo"/>
         <where>
             <if test="id != null  and id != ''"> and a.code = #{id}</if>
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.code asc
     </select>
 
-    <select id="selectSysDeptJlTree" parameterType="com.ruoyi.system.domain.SysDeptJl" resultMap="SysDeptJlResult">
+    <select id="selectSysDeptJlTree" parameterType="SysDeptJl" resultMap="SysDeptJlResult">
         select * from (select id, code, name, parent_id, level from sys_dept_jl where level &lt; 4) as a
         <where>
             <if test="id != null  and id != ''"> and a.code = #{id}</if>
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.parent_id = #{parentId}
     </select>
 
-    <insert id="insertSysDeptJl" parameterType="com.ruoyi.system.domain.SysDeptJl">
+    <insert id="insertSysDeptJl" parameterType="SysDeptJl">
         insert into sys_dept_jl
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateSysDeptJl" parameterType="com.ruoyi.system.domain.SysDeptJl">
+    <update id="updateSysDeptJl" parameterType="SysDeptJl">
         update sys_dept_jl
         <trim prefix="SET" suffixOverrides=",">
             <if test="code != null">code = #{code},</if>

ruoyi-modules/mz-system-ext/src/main/resources/mapper/system/SysDjpdzbJbpzMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDjpdzbJbpzMapper">
 
-    <resultMap type="com.ruoyi.system.domain.SysDjpdzbJbpz" id="SysDjpdzbJbpzResult">
+    <resultMap type="SysDjpdzbJbpz" id="SysDjpdzbJbpzResult">
         <result property="id"    column="id"    />
         <result property="sqId"    column="sq_id"    />
         <result property="xh"    column="xh"    />
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isFh"    column="is_fh"    />
     </resultMap>
 
-<!--    <select id="selectSysDjpdzbJbpzList" parameterType="com.ruoyi.system.domain.SysDjpdzbJbpz" resultMap="SysDjpdzbJbpzResult">-->
+<!--    <select id="selectSysDjpdzbJbpzList" parameterType="SysDjpdzbJbpz" resultMap="SysDjpdzbJbpzResult">-->
 <!--        select id, xh, pddj, pdnr, is_yx from sys_djpdzb_jbpz-->
 <!--        <where>-->
 <!--            is_yx = '1'-->
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--        </where>-->
 <!--        ORDER BY xh ASC-->
 <!--    </select>-->
-    <select id="selectSysDjpdzbJbpzList" parameterType="com.ruoyi.system.domain.SysDjpdzbJbpz" resultMap="SysDjpdzbJbpzResult">
+    <select id="selectSysDjpdzbJbpzList" parameterType="SysDjpdzbJbpz" resultMap="SysDjpdzbJbpzResult">
         select a.id as id, a.xh as xh, a.pddj as pddj, a.pdnr as pdnr, a.is_yx as is_yx, IFNULL(b.isFh, '0') as is_fh from sys_djpdzb_jbpz a
         left join zwyw_djpd_jbpd b on b.jbpz_id = a.id and b.sq_id = #{sqId}
         <where>
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY xh ASC
     </select>
 
-    <select id="selectZwywJbpz" parameterType="com.ruoyi.system.domain.SysDjpdzbJbpz" resultMap="SysDjpdzbJbpzResult">
+    <select id="selectZwywJbpz" parameterType="SysDjpdzbJbpz" resultMap="SysDjpdzbJbpzResult">
         select id, isFh as is_fh from zwyw_djpd_jbpd
         <where>
             state = '0'
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <insert id="insertDjpdzbJbpz" parameterType="com.ruoyi.system.domain.SysDjpdzbJbpz">
+    <insert id="insertDjpdzbJbpz" parameterType="SysDjpdzbJbpz">
         insert into zwyw_djpd_jbpd(
         <trim prefix="" suffixOverrides=",">
             <if test="id != null and id != ''">id,</if>
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
     </insert>
 
-    <update id="updateDjpdzbJbpz" parameterType="com.ruoyi.system.domain.SysDjpdzbJbpz">
+    <update id="updateDjpdzbJbpz" parameterType="SysDjpdzbJbpz">
         update zwyw_djpd_jbpd
         <trim prefix="SET" suffixOverrides=",">
             <if test="isFh != null and isFh != ''">isFh = #{isFh},</if>

ruoyi-modules/mz-system-ext/src/main/resources/mapper/system/SysDjpdzbXzpzMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDjpdzbXzpzMapper">
 
-    <resultMap type="com.ruoyi.system.domain.SysDjpdzbXzpz" id="SysDjpdzbXzpzResult">
+    <resultMap type="SysDjpdzbXzpz" id="SysDjpdzbXzpzResult">
         <result property="id"    column="id"    />
         <result property="pid"    column="pid"    />
         <result property="xh"    column="xh"    />
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="state"    column="state"    />
     </resultMap>
 
-    <select id="selectSysDjpdzbXzpzList" parameterType="com.ruoyi.system.domain.SysDjpdzbXzpz" resultMap="SysDjpdzbXzpzResult">
+    <select id="selectSysDjpdzbXzpzList" parameterType="SysDjpdzbXzpz" resultMap="SysDjpdzbXzpzResult">
         SELECT
             id,
             pid,

ruoyi-modules/mz-system-ext/src/main/resources/mapper/system/SysGgxxMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysGgxxMapper">
 
-    <resultMap type="com.ruoyi.system.domain.SysGgxx" id="SysGgxxResult">
+    <resultMap type="SysGgxx" id="SysGgxxResult">
         <result property="id"    column="id"    />
         <result property="tzfw"    column="tzfw"    />
         <result property="tzhx"    column="tzhx"    />
@@ -33,13 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, tzfw, tzhx, tznr, tzz, xgcl, zt, tzbt, tzdx, tzsj, create_time_str, create_user_id, create_by, create_user_type, create_unit, create_unit_name, update_time_str, update_user_id, update_by, update_unit, update_unit_name, state from sys_ggxx
     </sql>
 
-    <select id="selectSysGgxxList" parameterType="com.ruoyi.system.domain.SysGgxx" resultMap="SysGgxxResult">
+    <select id="selectSysGgxxList" parameterType="SysGgxx" resultMap="SysGgxxResult">
         <include refid="selectSysGgxxVo"/>
         where
         FIND_IN_SET(#{deptId},tzfw) and zt = 1 and FIND_IN_SET(#{tzdx},tzdx)
     </select>
 
-    <select id="selectSysGgxxListWh" parameterType="com.ruoyi.system.domain.SysGgxx" resultMap="SysGgxxResult">
+    <select id="selectSysGgxxListWh" parameterType="SysGgxx" resultMap="SysGgxxResult">
         <include refid="selectSysGgxxVo"/>
         <where>
             <if test="isWh != null "> and create_user_id = #{isWh}</if>

ruoyi-modules/mz-system-ext/src/main/resources/mapper/system/SysJgFwzljcMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysJgFwzljcMapper">
 
-    <resultMap type="com.ruoyi.system.domain.SysJgFwzljc" id="SysJgFwzljcResult">
+    <resultMap type="SysJgFwzljc" id="SysJgFwzljcResult">
         <result property="id"    column="id"    />
         <result property="xh"    column="xh"    />
         <result property="jcMc"    column="jc_mc"    />
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * FROM jc_yly
     </select>
 
-    <select id="selectJgFwljc" parameterType="com.ruoyi.system.domain.SysJgFwzljc" resultMap="SysJgFwzljcResult">
+    <select id="selectJgFwljc" parameterType="SysJgFwzljc" resultMap="SysJgFwzljcResult">
         SELECT * FROM sys_jg_fwzljc
         <where>
             <if test="zt != null  and zt != ''"> and zt = #{zt}</if>

ruoyi-modules/mz-system-ext/src/main/resources/mapper/system/SysTsxdXmglMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysTsxdXmglMapper">
 
-    <resultMap type="com.ruoyi.system.domain.SysTsxdXmgl" id="SysTsxdXmglResult">
+    <resultMap type="SysTsxdXmgl" id="SysTsxdXmglResult">
         <result property="id"    column="id"    />
         <result property="mc"    column="mc"    />
         <result property="createTimeStr"    column="create_time_str"    />

ruoyi-modules/mz-system-ext/src/main/resources/mapper/system/SysZbgzMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysZbgzMapper">
 
-    <resultMap type="com.ruoyi.system.domain.SysZbgz" id="SysZbgzResult">
+    <resultMap type="SysZbgz" id="SysZbgzResult">
         <result property="id"    column="id"    />
         <result property="xh"    column="xh"    />
         <result property="isUpload"    column="is_upload"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, xh,is_upload, zt, daxx, zbnr, tmsydx, zbxz, jcfs, tmdnpz, create_time_str, create_user_id, create_by, create_unit, create_unit_name, update_time_str, update_user_id, update_by, update_unit, update_unit_name, state from sys_zbgz
     </sql>
 
-    <select id="selectSysZbgzList" parameterType="com.ruoyi.system.domain.SysZbgz" resultMap="SysZbgzResult">
+    <select id="selectSysZbgzList" parameterType="SysZbgz" resultMap="SysZbgzResult">
         <include refid="selectSysZbgzVo"/>
 
         <where>
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <insert id="insertSysZbgz" parameterType="com.ruoyi.system.domain.SysZbgz">
+    <insert id="insertSysZbgz" parameterType="SysZbgz">
         insert into sys_zbgz
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateSysZbgz" parameterType="com.ruoyi.system.domain.SysZbgz">
+    <update id="updateSysZbgz" parameterType="SysZbgz">
         update sys_zbgz
         <trim prefix="SET" suffixOverrides=",">
             <if test="isUpload != null and isUpload != ''">is_upload = #{isUpload},</if>

ruoyi-modules/mz-system-lcdy/src/main/resources/mapper/system/ActReDeploymentMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.ActReDeploymentMapper">
 
-    <resultMap type="com.ruoyi.system.domain.vo.ActReDeploymentVO" id="ActReDeploymentResult">
+    <resultMap type="ActReDeploymentVO" id="ActReDeploymentResult">
         <id     property="id"       column="id"      />
         <result property="deployTime"       column="deploy_time"      />
     </resultMap>

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java

@@ -8,9 +8,9 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ext.api.domain.SysDictData;
 import com.ruoyi.ext.api.utils.OpenDictUtil;
 import com.ruoyi.ext.api.validate.group.AddGroup;
-import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import com.ruoyi.common.datascope.utils.BaseMapperPlus;
-import com.ruoyi.system.api.domain.SysDictData;
+import com.ruoyi.ext.api.domain.SysDictData;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.service;
 
-import com.ruoyi.system.api.domain.SysDictData;
+import com.ruoyi.ext.api.domain.SysDictData;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.system.service;
 
+import com.ruoyi.ext.api.domain.SysDictData;
 import com.ruoyi.ext.api.domain.SysObjDictRet;
-import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.api.domain.SysDictType;
 
 import java.util.List;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

@@ -1,7 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 import com.ruoyi.common.security.utils.DictUtils;
-import com.ruoyi.system.api.domain.SysDictData;
+import com.ruoyi.ext.api.domain.SysDictData;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -4,8 +4,8 @@ import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.DictUtils;
+import com.ruoyi.ext.api.domain.SysDictData;
 import com.ruoyi.ext.api.domain.SysObjDictRet;
-import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.api.domain.SysDictType;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.mapper.SysDictTypeMapper;