Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java

@@ -129,7 +129,7 @@ public class Heatsource implements Serializable {
 	@TableLogic
 	private String delFlag;		// 删除标识
 	/**创建人*/
-	private String createBy; 
+	private String createBy;
 	/**创建人*/
 	private String filePath;
 	/**创建时间*/

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml

@@ -559,21 +559,12 @@
     <select id="getStaticNowList" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
         SELECT t1.*
         FROM bl_heatanalysis_${params.startTime} t1
-        INNER JOIN (
-        SELECT
-        MIN(id) AS min_id
-        FROM bl_heatanalysis_${params.startTime}
-        WHERE DATE(datatime) = CURRENT_DATE()
-        AND view002 = #{params.sourceId}
-        AND view004 IS NULL
-        GROUP BY
-        DATE_FORMAT(datatime, '%Y-%m-%d %H'),
-        FLOOR(MINUTE(datatime)/5)
-        ) t2 ON t1.id = t2.min_id
+
         WHERE DATE(t1.datatime) = CURRENT_DATE()
         AND t1.view002 = #{params.sourceId}
         AND t1.view004 IS NULL
         ORDER BY t1.datatime
+        limit 24
     </select>
 
     <select id="yunweiPage" resultType="org.jeecg.modules.heating.entity.Heatanalysis">