Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/org/springblade/ldt/shop/entity/Shop.java
#	src/main/java/org/springblade/ldt/shop/mapper/ShopMapper.xml

src/main/java/org/springblade/modules/resource/builder/sms/client/HwClient.java

@@ -56,6 +56,7 @@ public class HwClient {
 				smsProperties.getSignName()))
 			.execute();
 		JSONObject resObj = JSON.parseObject(res.body());
+		System.out.println("华为云短信返回："+resObj.toString());
 		return new SmsResponse(Objects.equals("000000",resObj.getString("code")), res.getStatus(), resObj.getString("description"));
 	}
 

src/main/java/org/springblade/modules/system/vo/DictBizVO.java

@@ -68,4 +68,7 @@ public class DictBizVO extends DictBiz implements INode<DictBizVO> {
 	 * 上级字典
 	 */
 	private String parentName;
+
+
+	private Boolean hasChildren;
 }

src/main/java/org/springblade/modules/system/wrapper/DictBizWrapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.system.wrapper;
 
+import net.sf.jsqlparser.statement.merge.Merge;
 import org.springblade.common.cache.DictBizCache;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -55,7 +56,15 @@ public class DictBizWrapper extends BaseEntityWrapper<DictBiz, DictBizVO> {
 
 	public List<DictBizVO> listNodeVO(List<DictBiz> list) {
 		List<DictBizVO> collect = list.stream().map(dict -> BeanUtil.copy(dict, DictBizVO.class)).collect(Collectors.toList());
-		return ForestNodeMerger.merge(collect);
+		List<DictBizVO> result = ForestNodeMerger.merge(collect);
+		result.stream().forEach(
+			dictBizVO -> {
+				if(dictBizVO.getChildren() != null&&dictBizVO.getChildren().size()>0){
+					dictBizVO.setHasChildren(true);
+				}
+			}
+		);
+		return result;
 	}
 
 }

src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ social:
 blade:
   secure:
     skip-url:
-      /**
+#      /**
   #分布式锁配置
   lock:
     ##是否启用分布式锁