Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims 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/ims
-  newTag: 0292a762ae1a5845e4a11d682dab61ead73b2ac9
+  newTag: e680f99865af925fc335aafec5e9462fc366efc1

release-service/src/main/java/com/mmc/csf/release/feign/UserAppApi.java

@@ -15,7 +15,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -88,6 +87,6 @@ public interface UserAppApi {
     @GetMapping("/userapp/userPoint/feignChangeUserPoints")
     ResultBody feignChangeUserPoints(@RequestHeader("token") String token,@RequestHeader HttpServletRequest request, @RequestParam("id") int changePoint,@RequestParam("reason") String reason);
 
-    @GetMapping("/userapp/pay/feignCurriculumOrderLog")
+    @PostMapping("/userapp/pay/feignCurriculumOrderLog")
     ResultBody feignCurriculumOrderLog(@RequestHeader("token") String token,@RequestHeader HttpServletRequest request,@RequestBody CurriculumOrderLogVO curriculumOrderLogVO);
 }