diff --git a/src/main/java/com/nlf/calendar/Lunar.java b/src/main/java/com/nlf/calendar/Lunar.java index 384548b..d419e48 100644 --- a/src/main/java/com/nlf/calendar/Lunar.java +++ b/src/main/java/com/nlf/calendar/Lunar.java @@ -613,8 +613,8 @@ public class Lunar{ } /** - * 获取刹 - * @return 刹,如北 + * 获取煞 + * @return 煞,如北 */ public String getSha(){ return LunarUtil.SHA.get(getDayZhi()); @@ -723,7 +723,7 @@ public class Lunar{ s.append(")"); s.append(" 冲["); s.append(getChongDesc()); - s.append("] 刹["); + s.append("] 煞["); s.append(getSha()); s.append("]"); return s.toString(); diff --git a/src/main/java/com/nlf/calendar/util/LunarUtil.java b/src/main/java/com/nlf/calendar/util/LunarUtil.java index 9667e1a..d6dbd26 100644 --- a/src/main/java/com/nlf/calendar/util/LunarUtil.java +++ b/src/main/java/com/nlf/calendar/util/LunarUtil.java @@ -281,7 +281,7 @@ public class LunarUtil{ put("壬","丁"); } }; - /** 刹(逢巳日、酉日、丑日必煞东;亥日、卯日、未日必煞西;申日、子日、辰日必煞南;寅日、午日、戌日必煞北) */ + /** 煞(逢巳日、酉日、丑日必煞东;亥日、卯日、未日必煞西;申日、子日、辰日必煞南;寅日、午日、戌日必煞北) */ public static final Map SHA = new HashMap(){ private static final long serialVersionUID = -1; {