From 3b65a5dc04be7cdac460c84ebaa38bf009405128 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 八月 2025 09:23:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects
---
河北望美项目/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
index 9384d64..fee95bf 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
@@ -35,7 +35,7 @@
public List<PatternTask> findbygroups2(Long groups,Long id);
- @Query("select t from PatternTask t where t.groups=?1")
+ @Query("select t from PatternTask t where t.groups=?1 order by t.rawFile.createTime desc,t.rank")
public List<PatternTask> findIdGroup(Long groups);
@Query("select t from PatternTask t where t.groups=?1 group by t.rawWidth,t.rawHeight,t.rawThickness,t.color")
--
Gitblit v1.8.0