Merge remote-tracking branch 'origin/dev_20260131_youshen430' into dev_20260131_youshen430

sckw-modules/sckw-order/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -1026,7 +1026,6 @@
         <where>
             kto.del_flag = 0
             and kto.status = 4
-            group by kto.id
         </where>
     </select>
 
@@ -1056,7 +1055,7 @@
           and kto.status = 5
           and ku.top_ent_id = #{entId}
           and kto.create_time >= #{startTime}
-          and kto.create_time <= #{endTime}
+          and kto.create_time &lt;= #{endTime}
         group by DATE_FORMAT(kto.create_time, '%Y-%m-%d'), ktog.goods_type
         order by orderDate, goodsType;
     </select>
@@ -1072,7 +1071,7 @@
           and kto.status = 5
           and ku.top_ent_id = #{entId}
           and kto.create_time >= #{startTime}
-          and kto.create_time <= #{endTime}
+          and kto.create_time &lt;= #{endTime}
         group by DATE_FORMAT(kto.create_time, '%Y-%m-%d'), ktog.goods_type
         order by orderDate, goodsType;
     </select>