Merge remote-tracking branch 'origin/master'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/impl/PilotCertificationServiceImpl.java

@@ -315,8 +315,7 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         }
         Integer backUserId = param.getBackUserId();
         if(backUserId == null) {
-        collects = collects.stream().skip((pageNo - 1) * param.getPageSize()).limit(param.getPageSize()).
-                collect(Collectors.toList());
+
         }else {
             collects = collects.stream().filter(collect -> backUserId.equals(collect.getBackUserId())).skip((pageNo - 1) * param.getPageSize()).limit(param.getPageSize()).
                     collect(Collectors.toList());

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/cms
-  newTag: 65c6faaed739500063357a6082ddfbc3fbe3fc32
+  newTag: 9dce0670b42eaef9257cde2f1049cc7779436b81

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: 846f745c618029d8e6ab6a3ab0be389d79599b71
+  newTag: ca02a72e82825aa22503e2c9e1845d66b04e49ed