From b87d1e75d7002843536e9ddf455d9f9fa8d5e4d8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 09:57:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
applet/src/main/resources/mapping/TOrderMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/applet/src/main/resources/mapping/TOrderMapper.xml b/applet/src/main/resources/mapping/TOrderMapper.xml
index ce40bf0..9f5288b 100644
--- a/applet/src/main/resources/mapping/TOrderMapper.xml
+++ b/applet/src/main/resources/mapping/TOrderMapper.xml
@@ -9,7 +9,6 @@
<result column="userId" property="userId" />
<result column="optometryId" property="optometryId" />
<result column="storeId" property="storeId" />
- <result column="modelId" property="modelId" />
<result column="color" property="color" />
<result column="series" property="series" />
<result column="rLens" property="rLens" />
@@ -45,13 +44,13 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, code, userId, optometryId, storeId, modelId, color, series, rLens, lLens, `type`, refractiveIndex,
+ id, code, userId, optometryId, storeId, color, series, rLens, lLens, `type`, refractiveIndex,
createTime, updateTime, createBy, updateBy, isDelete, sysId, couponId, itemsId, remark, isMail, mailName,
mailPhone, mailAddress, orderMoney, couponMoney, payMoney, isMachining, machiningCode, isAccounting, accountingName,
accountingTime,brandId,brandName,seriesName,modelName
</sql>
<select id="pageList" resultType="com.jilongda.applet.vo.TOrderVO">
- select t.id, t.code, t.userId, t.optometryId, t.storeId, t.modelId, t.color, t.series, t.rLens, t.lLens, t.`type`, t.refractiveIndex,
+ select t.id, t.code, t.userId, t.optometryId, t.storeId, t.color, t.series, t.rLens, t.lLens, t.`type`, t.refractiveIndex,
t.createTime, t.updateTime, t.createBy, t.updateBy, t.isDelete, t.sysId, t.couponId, t.itemsId, t.remark, t.isMail, t.mailName,
t.mailPhone, t.mailAddress, t.orderMoney, t.couponMoney, t.payMoney, t.isMachining, t.machiningCode, t.isAccounting, t.accountingName,
t.accountingTime,t.brandId,t.brandName,t.seriesName,t.modelName,ts.name as storeName
--
Gitblit v1.7.1