Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -102,7 +102,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
         // 获取任务派发模板
         Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
-                alertCalled.getAlertType()));
+                alertCalled.getAlertType()).eq("format", false));
         String content = template.getContent();
         Map<String, String> definitions = new HashMap<>();
         initDefinitions(definitions, alertCalled, powerTransferDto);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/utils/BeanDtoVoUtils.java

@@ -59,6 +59,7 @@ public class BeanDtoVoUtils {
         if (source == null) {
             return null;
         }
+
         try {
             // 创建新的对象实例
             FireExpertsDto target = FireExpertsDto.class.newInstance();
@@ -112,6 +113,9 @@ public class BeanDtoVoUtils {
 
     //由出生日期获得年龄
     public static int getAge(Date birthDay) {
+        if(birthDay == null){
+            return 0;
+        }
         Calendar cal = Calendar.getInstance();
 
         if (cal.before(birthDay)) {