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

---
 manage/src/main/resources/mapping/TOrderMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/manage/src/main/resources/mapping/TOrderMapper.xml b/manage/src/main/resources/mapping/TOrderMapper.xml
index 0675f48..3c6903d 100644
--- a/manage/src/main/resources/mapping/TOrderMapper.xml
+++ b/manage/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" />
@@ -46,7 +45,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, code, userId, optometryId, storeId, modelId, color, series, rLens, lLens, `type`, refractiveIndex, createTime, updateTime, createBy,
+        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,phone, realName, age, gender,payTypeName
     </sql>

--
Gitblit v1.7.1