完善

competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml

@@ -81,13 +81,15 @@
         ) AS applicant_num,
         c.is_open,
         create_source,
-        ( CASE create_source WHEN 0 THEN '平台创建' WHEN 1 THEN '组织创建' ELSE '无' END ) AS createSource
+        ( CASE create_source WHEN 0 THEN '平台创建' WHEN 1 THEN '组织创建' ELSE '无' END ) AS createSource,
+        cla.classification_name,
+        c.classification_id
         FROM
         c_competition c
+        INNER JOIN c_competition_classification cla ON c.classification_id = cla.id
         WHERE
         1 = 1
 
-
         <if test=" req.startTime!=null and req.endTime!=null ">
             and create_time between #{req.startTime} and #{req.endTime}
         </if>

nakadai/src/main/java/com/huoran/nakadai/controller/SupplierClassificationController.java

@@ -36,7 +36,7 @@ public class SupplierClassificationController {
     
     @PostMapping("/treeStructureList")
     @ApiOperation(value = "树结构列表", response = SupplierClassification.class)
-    public R treeStructureList(@RequestBody SupplierClassificationReq supplierClassification) {
+    public R treeStructureList() {
         /*QueryWrapper<SupplierClassification> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("parent_id", supplierClassification.getParentId());*/
         List<SupplierClassification> list = service.list(null);

nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassification.java

@@ -1,5 +1,6 @@
 package com.huoran.nakadai.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -54,12 +55,16 @@ public class SupplierClassification implements Serializable {
     //使用@JsonIgnore注解，忽略此属性，前端不会拿到该属性
     @JsonIgnore
     @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     //使用@JsonIgnore注解，忽略此属性，前端不会拿到该属性
     @JsonIgnore
     @ApiModelProperty(value = "修改时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
+
+
     
     @ApiModelProperty(value = "子分类集合")
     @TableField(exist = false)

nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassificationConfig.java

@@ -26,6 +26,7 @@ public class SupplierClassificationConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     @ApiModelProperty(value = "分类id")