From bf11e1376ff82a5f32509ee4cb69cbc1782fddf4 Mon Sep 17 00:00:00 2001 From: DYL <Dn1332079466> Date: 星期六, 08 二月 2025 17:27:59 +0800 Subject: [PATCH] Merge branch 'refs/heads/develop1.0' into dyl_dev --- zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml b/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml index c6d65e1..37b928f 100644 --- a/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml +++ b/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zhitan.dataitem.mapper.DataItemMapper"> - <resultMap type="StagseDataEntry" id="stagseDataEntryResult"> + <resultMap type="com.zhitan.dataitem.domain.StagseDataEntry" id="stagseDataEntryResult"> <result property="code" column="code"/> <result property="name" column="name"/> <result property="indexId" column="index_id"/> @@ -15,7 +15,7 @@ <result property="dataTime" column="data_time"/> </resultMap> - <select id="getSettingIndex" parameterType="StagseDataEntry" resultMap="stagseDataEntryResult"> + <select id="getSettingIndex" parameterType="com.zhitan.dataitem.domain.StagseDataEntry" resultMap="stagseDataEntryResult"> SELECT ei.index_id, @@ -33,7 +33,7 @@ and si.time_type = #{timeType} AND si.calc_type = #{calcType} </select> - <select id="getSettingEdit" parameterType="StagseDataEntry" resultMap="stagseDataEntryResult"> + <select id="getSettingEdit" parameterType="com.zhitan.dataitem.domain.StagseDataEntry" resultMap="stagseDataEntryResult"> SELECT ei.index_id, code, @@ -54,7 +54,7 @@ AND data_time >= #{beginTime} AND data_time <= #{endTime} </select> - <select id="stagseDataByCode" parameterType="StagseDataEntry" resultMap="stagseDataEntryResult"> + <select id="stagseDataByCode" parameterType="com.zhitan.dataitem.domain.StagseDataEntry" resultMap="stagseDataEntryResult"> SELECT ei.index_id, code, -- Gitblit v1.9.3