Merge remote-tracking branch 'origin/master'

zzw

2023-11-20 2c89ccdc9e008060f8cd6608c9fcb014616987a3

 modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml

@@ -4,10 +4,11 @@
<mapper namespace="com.zt.life.modules.project.dao.EnvironDao">

    <select id="getList" resultType="com.zt.life.modules.project.model.Environ">
        select a.*
        from environ a
        SELECT a.*, p.*
        FROM software_test_order a
        INNER JOIN  project p ON p.id = a.project_id
        <where>
            a.is_delete = 0
            a.is_delete = 0 and p.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            </if>