From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001 From: zzw <wander.zheng@qq.com> Date: 星期三, 29 十一月 2023 17:03:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml index dc5a2f0..bb4bcc9 100644 --- a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml +++ b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml @@ -2,10 +2,9 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zt.life.modules.project.dao.EnvironDao"> - <select id="getList" resultType="com.zt.life.modules.project.model.Environ"> SELECT a.*, p.* - FROM software_test_order a + FROM environ a INNER JOIN project p ON p.id = a.project_id <where> a.is_delete = 0 and p.is_delete = 0 -- Gitblit v1.9.1