Merge branch 'future/strokeList' into 'master'

Future/stroke list

See merge request hewei/Jumeirah!41

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantUserManagerController.java

@@ -61,6 +61,12 @@ public class MerchantUserManagerController extends BaseController {
     public ApiResult<Boolean> addMerchantUser(@Validated(Add.class) @RequestBody MerchantUserAddParam merchantUserAddParam) throws Exception {
         JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
 
+        // 查重
+        MerchantUser one = merchantUserService.getOne(new QueryWrapper<MerchantUser>().lambda().eq(MerchantUser::getUsername,merchantUserAddParam.getUsername()));
+        if (one !=null){
+            return ApiResult.fail();
+        }
+
         MerchantUser merchantUser = new MerchantUser();
         BeanUtils.copyProperties(merchantUserAddParam, merchantUser);
         merchantUser.setMcId(jwtToken.getMcId());