diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
index c5659944..c23c9415 100644
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
@@ -169,8 +169,12 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, Dept> implement
         int jobCount = jobMapper.selectCount(Wrappers.<Job>lambdaQuery().in(Job::getDeptId,deptIds));
         int roleCount = rolesDeptsMapper.selectCount(Wrappers.<RolesDepts>lambdaQuery()
                 .in(RolesDepts::getDeptId,deptIds));
-        if(jobCount > 0) throw new BadRequestException( "所选部门中存在与岗位关联，请取消关联后再试");
-        if(roleCount > 0) throw new BadRequestException( "所选部门中存在与角色关联，请取消关联后再试");
+        if(jobCount > 0) {
+            throw new BadRequestException( "所选部门中存在与岗位关联，请取消关联后再试");
+        }
+        if(roleCount > 0) {
+            throw new BadRequestException( "所选部门中存在与角色关联，请取消关联后再试");
+        }
         this.removeByIds(deptIds);
     }
 
diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
index 71b582ee..ceb5576b 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
@@ -217,7 +217,9 @@ public class StoreOrderController {
         }
 
         //处理是否已经修改过订单价格，如果修改用新的单号去拉起支付
-        if(StrUtil.isNotBlank(storeOrder.getExtendOrderId())) orderId = storeOrder.getExtendOrderId();
+        if(StrUtil.isNotBlank(storeOrder.getExtendOrderId())) {
+            orderId = storeOrder.getExtendOrderId();
+        }
 
 
         orderSupplyService.goPay(map,orderId,uid, param.getPaytype(),param.getFrom(),orderDTO);
diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java b/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java
index 7878cb4d..3624acfd 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java
@@ -188,7 +188,9 @@ public class CreatShareProductService {
             }
         }
         else{//其他
-            if(StrUtil.isBlank(from)) from = AppFromEnum.H5.getValue();
+            if(StrUtil.isBlank(from)) {
+                from = AppFromEnum.H5.getValue();
+            }
 
             String name = uid + "_"+from+"_user_wap.jpg";
 
diff --git a/yshop-common/src/main/java/co/yixiang/utils/location/LocationUtils.java b/yshop-common/src/main/java/co/yixiang/utils/location/LocationUtils.java
index 3e75b8aa..1657508e 100644
--- a/yshop-common/src/main/java/co/yixiang/utils/location/LocationUtils.java
+++ b/yshop-common/src/main/java/co/yixiang/utils/location/LocationUtils.java
@@ -58,7 +58,9 @@ public class LocationUtils {
 
     public static GetTencentLocationVO getLocation(String addr) {
         String key = RedisUtil.get(ShopKeyUtils.getTengXunMapKey());
-        if (StrUtil.isBlank(key)) throw new BadRequestException("请先配置腾讯地图key");
+        if (StrUtil.isBlank(key)) {
+            throw new BadRequestException("请先配置腾讯地图key");
+        }
         String url = StrUtil.format("?address={}&key={}", addr, key);
         String json = HttpUtil.get(QQ_MAP_URL + url);
         return JSONObject.parseObject(json, GetTencentLocationVO.class);
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java
index a6e8ac8b..938d6610 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java
@@ -36,6 +36,7 @@ public interface YxStoreCombinationMapper extends CoreMapper<YxStoreCombination>
             " AND c.stop_time > now() ORDER BY c.sort desc,c.id desc")
     List<YxStoreCombinationQueryVo> getCombList(Page page);
 
+    @Override
     IPage<YxStoreCombination> selectPage(IPage<YxStoreCombination> page, @Param("ew") Wrapper<YxStoreCombination> queryWrapper);
 
     @Select("SELECT c.id,c.effective_time as effectiveTime,c.image,c.people,c.price,c.browse," +
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
index 39f4ae8f..4a853043 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
@@ -129,7 +129,9 @@ public class YxStoreOrderQueryVo implements Serializable {
     private String deliveryType;
 
     public String getDeliveryType() {
-        if(StrUtil.isBlank(deliveryType)) return "express";
+        if(StrUtil.isBlank(deliveryType)) {
+            return "express";
+        }
         return deliveryType;
     }
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java
index 4e725b9c..80dab13b 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java
@@ -75,7 +75,9 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl<StoreProduct
     public ReplyCountVo getReplyCount(long productId) {
         int sumCount = productReplyCount(productId);
 
-        if(sumCount == 0) return new ReplyCountVo();
+        if(sumCount == 0) {
+            return new ReplyCountVo();
+        }
 
         //好评
         int goodCount = this.baseMapper.selectCount(Wrappers.<YxStoreProductReply>lambdaQuery()