Ver Fonte

更新!

TRX há 1 ano atrás
pai
commit
40ac080f9a

+ 4 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/openApi/model/order/OrderCreateParam.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.client.openApi.model.order;
 
 import com.zhongshu.card.client.openApi.base.ProjectCodeParam;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -11,5 +12,8 @@ import lombok.Data;
 @Data
 public class OrderCreateParam extends ProjectCodeParam {
 
+    @Schema(description = "设备id")
+    private String deviceId;
+
 
 }

+ 0 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/OrganizationUserController.java

@@ -171,7 +171,6 @@ public class OrganizationUserController {
     @Operation(summary = "小程序注册用户", description = "小程序注册用户")
     @RequestMapping(value = {"registerProjectUser"}, method = {RequestMethod.POST})
     public ResultContent registerProjectUser(@RequestBody UserCountRegisterParam param) {
-        Assert.hasText(param.getProjectOid(), "projectOid不能为空");
         Assert.hasText(param.getPhone(), "phone不能为空");
         return organizationUserService.registerProjectUser(param);
     }

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -474,7 +474,7 @@ public class OrganizationUserServiceImpl extends SuperService {
                 return ResultContent.buildFail(String.format("code已存在:%s", param.getCode()));
             }
             organizationUser = new OrganizationUser();
-            initEntity(organizationUser);
+            initEntityNoCheckOid(organizationUser);
             BeanUtils.copyProperties(param, organizationUser);
 
             // 在机构中的用户类型