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

fs-user-app/src/main/java/com/fs/app/controller/store/AddressScrmController.java

@@ -98,10 +98,10 @@ public class AddressScrmController extends AppBaseController {
     @PostMapping("/addAddress")
     public R addAddress(@Valid @RequestBody FsUserAddressAddEditParam address, HttpServletRequest request){
         //处理地址数量 最大20个
-        Integer count=addressService.selectFsUserAddressCountsByUserId(Long.parseLong(getUserId()));
-        if(count>20){
-            return R.error("最多可创建20个地址");
-        }
+//        Integer count=addressService.selectFsUserAddressCountsByUserId(Long.parseLong(getUserId()));
+//        if(count>20){
+//            return R.error("最多可创建20个地址");
+//        }
         address.setUserId(Long.parseLong(getUserId()));
         if(address.getIsDefault()==1){
             //处理默认地址