moral.git - Gitblit

summary
reflog
commits
tree
tickets
docs
forks
compare

Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a

 screen-api/src/main/resources/mapper/CityAqiDailyMapper.xml

@@ -23,7 +23,7 @@
            GROUP BY c.city_code order by nums
        </if>
        <if test="type == 3 ">
            and c.time <![CDATA[>=]]> #{start}
            and DATE_FORMAT(c.time,'%Y') <![CDATA[>=]]> #{start}
            GROUP BY c.city_code order by nums
        </if>
    </select>

			@@ -23,7 +23,7 @@
			GROUP BY c.city_code order by nums
			</if>
			<if test="type == 3 ">
			and c.time <![CDATA[>=]]> #{start}
			and DATE_FORMAT(c.time,'%Y') <![CDATA[>=]]> #{start}
			GROUP BY c.city_code order by nums
			</if>
			</select>