Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/dronepilot/PilotCertificationVO.java

@@ -76,4 +76,7 @@ public class PilotCertificationVO {
 
     @ApiModelProperty(value = "审核是否通过 0审核中 1审核通过 2审核不通过", example = "0", required = false)
     private Integer auditStatus;
+
+    @ApiModelProperty(value = "飞手简历")
+    private String pilotResume;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/dronepilot/PilotCertificationDO.java

@@ -117,6 +117,8 @@ public class PilotCertificationDO {
     @ApiModelProperty(value = "飞手头像", example = "http://")
     private String userImg;
 
+    private String pilotResume;
+
     public PilotCertificationDO(PilotCertificationVO pilotCertificationVO, Integer userAccountId) {
         this.id = pilotCertificationVO.getId();
         this.licenseType = pilotCertificationVO.getLicenseType();
@@ -131,6 +133,7 @@ public class PilotCertificationDO {
         this.remark = pilotCertificationVO.getRemark();
         this.auditStatus = pilotCertificationVO.getAuditStatus();
         this.userAccountId = userAccountId;
+        this.pilotResume = pilotCertificationVO.getPilotResume();
     }
 
 

csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml

@@ -128,6 +128,9 @@
             <if test=" residentCity != null and residentCity != '' ">
                 resident_city = #{residentCity},
             </if>
+            <if test="pilotResume != null and pilotResume != '' ">
+                pilot_resume = #{pilotResume},
+            </if>
             update_time=NOW(),
             audit_status = 0
         </set>