From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期五, 17 十一月 2023 16:45:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml index d5b1e91..928ac0b 100644 --- a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml +++ b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml @@ -244,7 +244,7 @@ <resultMap id="resultMap" type="com.chinaztt.mes.plan.vo.CustomerOrderVO2"> <id property="id" column="id"/> - <result property="customerOrderNo" column="customer_order_no"/> + <result property="contractNo" column="contract_no"/> <result property="entityName" column="entity_name"/> <result property="createUser" column="create_user"/> <result property="createTime" column="create_time"/> @@ -273,7 +273,7 @@ <select id="getCustomerOrderPage" resultMap="resultMap"> select * from (SELECT pco.id , - customer_order_no , + contract_no , pc.entity_name , pc.create_user , pc.create_time , -- Gitblit v1.9.3