Merge branch '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/ims
-  newTag: 6f3ad603703d1d0435d83e3e6bf472d8e0467c50
+  newTag: 9662a16b5e00c37e8ad531069afff3dcc58668b2

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -600,9 +600,7 @@
                                          create_time, update_time, preempt_phone)
         VALUES (#{requirementsInfoId}, #{pilotCertificationId}, #{pilotCertificationUserId},
                 #{teamId}, #{teamUserId}, #{cashAmount}, #{weChat}, #{salaryAmount}, #{wechatPayOrderNumber},
-            CASE #{serviceFlowId}
-                when null then 10
-                else #{serviceFlowId} end
+                coalesce(#{serviceFlowId}, 10)
                 ,
                 #{preemptTotalAmount}, #{openid}, NOW(), NOW(), #{phoneNum});
     </insert>