Merge remote-tracking branch 'origin/master'

zzw

2023-11-28 7748cd8a79548e94299d24e080c4650924a215da

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

@@ -2,7 +2,6 @@
<!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 environ a