Merge remote-tracking branch 'origin/master'

src/main/java/com/biutag/supervision/mapper/ModelClassMapper.java

@@ -12,7 +12,7 @@ public interface ModelClassMapper extends BaseMapper<ModelClass> {
     @Select("select mc.id, mc.name, mc.sort, count(m.id) size from model_class mc left join model m on mc.id = m.class_id where status = 1  GROUP BY mc.id, mc.name, mc.sort order by sort")
     List<ModelClassModel> selectListByStatus();
 
-    @Select("select mc.id, mc.name, mc.sort, count(m.id) size from model_class mc left join model m on mc.id = m.class_id GROUP BY mc.id, mc.name, mc.sort order by sort")
+    @Select("select mc.id, mc.name, mc.model_type, mc.sort, count(m.id) size from model_class mc left join model m on mc.id = m.class_id GROUP BY mc.id, mc.name, mc.sort order by sort")
     List<ModelClassModel> selectListAll();
 
 

src/main/java/com/biutag/supervision/pojo/model/ModelClassModel.java

@@ -19,4 +19,5 @@ public class ModelClassModel {
 
     private Integer size;
 
+    private String modelType;
 }