Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/WorkerController.java

@@ -118,10 +118,10 @@ public class WorkerController {
     public ResponseHelper<PolicyOrder> order(
             @ApiParam(value = "保险id", required = true) @RequestParam String policyId,
             @ApiParam(value = "网点id", required = true) @RequestParam String websitId,
-            @ApiParam(value = "用户id", required = true) @RequestParam String userId,
+
             HttpServletRequest request
     ) throws ParseException {
-        PolicyOrder order = workerLogic.order(policyId,websitId,userId);
+        PolicyOrder order = workerLogic.order(policyId,websitId);
         return ResponseHelper.success(order);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -243,7 +243,7 @@ public class WorkerLogic {
         return policyDetail;
     }
 
-    public PolicyOrder order(String policyId, String websitId, String userId) {
+    public PolicyOrder order(String policyId, String websitId) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         Policy policy = policyService.getById(policyId);