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

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 902af792c6dd982ceccbbac0c839289a070d40f3
+  newTag: e2fcf6e3d5f73b2f9487514cb1afccb763f4ef3e

src/main/java/com/mmc/pms/entity/inspection/InspectionDO.java

@@ -72,7 +72,7 @@ public class InspectionDO implements Serializable {
     public InspectionDTO buildInspectionDTO(){
         return InspectionDTO.builder().id(this.id).industryTypeId(this.industryTypeId).inspectionNo(this.inspectionNo)
                 .inspectionName(this.inspectionName).inspectionDescription(this.inspectionDescription).inspectionImg(this.inspectionImg)
-                .saleState(this.saleState).caseImg(this.caseImg).caseVideo(this.caseVideo).build();
+                .saleState(this.saleState).caseImg(this.caseImg).caseVideo(this.caseVideo).createTime(this.createTime).build();
     }
 
 }

src/main/java/com/mmc/pms/model/inspection/dto/InspectionDTO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -37,6 +38,8 @@ public class InspectionDTO implements Serializable {
     private String caseImg;
     @ApiModelProperty(value = "案例视频")
     private String caseVideo;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
     @ApiModelProperty(value = "团队服务列表")
     List<CompanyInspectionDTO> companyInspectionDTOS;
 }

src/main/resources/mapper/inspection/IndustryTypeDao.xml

@@ -19,7 +19,7 @@
 
     <select id="listInspectionsByIndustryTypeIdId" resultType="com.mmc.pms.entity.inspection.InspectionDO">
         select ins.id , ins.inspection_no, ins.inspection_name, ins.industry_type_id, ins.inspection_img,
-        ins.inspection_description, ins.sale_state as ins_sale_state, ins.case_img, ins.case_video
+        ins.inspection_description, ins.sale_state as ins_sale_state, ins.case_img, ins.case_video, ins.create_time
          from inspection ins
           where ins.is_deleted = 0 and ins.industry_type_id = #{industryTypeId} order by ins.id desc
     </select>