Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: cf075ff8f7b24e87f2697d4d78c3493a6e164adc
+  newTag: 7db6bb0d7751383a9dbccadb1ed9b25f63eb7724

release-service/src/main/java/com/mmc/csf/release/entity/PilotRegistrationDO.java

@@ -50,8 +50,8 @@ public class PilotRegistrationDO implements Serializable {
     private Date updateTime;
     private Integer deleted;
 
-    public PilotRegistrationDO(RegistrationVO registrationVO, Integer id) {
-        this.applyUserId = id;
+    public PilotRegistrationDO(RegistrationVO registrationVO) {
+        this.applyUserId = registrationVO.getId();
         this.name = registrationVO.getName();
         this.city = registrationVO.getCity();
         this.telephone = registrationVO.getTelephone();

release-service/src/main/java/com/mmc/csf/release/service/FlyerTrainingService.java

@@ -15,7 +15,6 @@ public interface FlyerTrainingService {
      * 飞手报名
      *
      * @param registrationVO 注册信息
-     * @param id             id
      * @return {@link ResultBody}
      */
     ResultBody pilotRegistration(RegistrationVO registrationVO);

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

@@ -34,7 +34,7 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
 
     @Override
     public ResultBody pilotRegistration(RegistrationVO registrationVO) {
-        PilotRegistrationDO pilotRegistrationDO = new PilotRegistrationDO(registrationVO,registrationVO.getId());
+        PilotRegistrationDO pilotRegistrationDO = new PilotRegistrationDO(registrationVO);
         if (CollectionUtils.isNotEmpty(registrationVO.getIndustryAppAuth())) {
             // 将行业应用认证的id用逗号拼接
             String industryAppAuth = registrationVO.getIndustryAppAuth().stream().map(Object::toString).collect(Collectors.joining(","));

release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml

@@ -6,9 +6,9 @@
 
     <insert id="insertPilotRegistrationInfo" parameterType="com.mmc.csf.release.entity.PilotRegistrationDO"
             useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO pilot_registration(id, apply_user_id, `name`, city, telephone, driving_license, province,
+        INSERT INTO pilot_registration(apply_user_id, `name`, city, telephone, driving_license, province,
                                        uav_license, industry_app_auth, remark)
-        VALUES (#{id}, #{applyUserId}, #{name}, #{city}, #{telephone}, #{drivingLicense}, #{province}, #{uavLicense},
+        VALUES (#{applyUserId}, #{name}, #{city}, #{telephone}, #{drivingLicense}, #{province}, #{uavLicense},
                 #{industryAppAuth}, #{remark})
     </insert>
     <select id="selectAllLicenses" resultType="com.mmc.csf.release.flyer.vo.DronePilotLicenseVO">