From c482f4536513b8b1f3245ec7953c78fd14d137a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 23 十二月 2024 09:49:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml | 6 +++---
manage/src/main/java/com/jilongda/manage/dto/TWarehousingLensDTO.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/dto/TWarehousingLensDTO.java b/manage/src/main/java/com/jilongda/manage/dto/TWarehousingLensDTO.java
index 4fdaba8..14d5b3d 100644
--- a/manage/src/main/java/com/jilongda/manage/dto/TWarehousingLensDTO.java
+++ b/manage/src/main/java/com/jilongda/manage/dto/TWarehousingLensDTO.java
@@ -10,7 +10,7 @@
import java.util.List;
@Data
-@ApiModel(value = "镜架出入库DTO")
+@ApiModel(value = "镜片出入库DTO")
public class TWarehousingLensDTO extends TWarehousing {
@ApiModelProperty(value = "镜架出入库明细列表")
diff --git a/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml b/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
index 712a06c..88c79fe 100644
--- a/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
+++ b/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
@@ -24,11 +24,11 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, brand, supplier, series, refractiveIndex, ballMirror, columnMirror, type, total, createTime, updateTime, createBy, updateBy, isDelete, count, seriesId
+ id, brand, supplier, series, refractiveIndex, ballMirror, columnMirror, `type`, total, createTime, updateTime, createBy, updateBy, isDelete, `count`, seriesId
</sql>
<select id="pageLensList" resultType="com.jilongda.manage.vo.TLensWarehousingDetailVO">
select tlwd.id, tlwd.warehousingId, tlwd.brand, tlwd.supplier, tlwd.series, tlwd.total, tlwd.refractiveIndex, tlwd.ballMirror, tlwd.code, tlwd.createTime,tlwd.columnMirror,
- tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.type
+ tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`
from t_lens_warehousing_detail tlwd
left join t_warehousing tw on tlwd.warehousingId = tw.id
<where>
@@ -39,7 +39,7 @@
and tlwd.series = #{query.series}
</if>
<if test="query.type != null and query.type != ''">
- and tlwd.type = #{query.type}
+ and tlwd.`type` = #{query.type}
</if>
<if test="query.refractiveIndex != null and query.refractiveIndex != ''">
and tlwd.refractiveIndex = #{query.refractiveIndex}
--
Gitblit v1.7.1