From 664af99ae0431b080ee60399aae8330bd1f701eb Mon Sep 17 00:00:00 2001
From: 6tail <6tail@6tail.cn>
Date: Tue, 29 Apr 2025 14:59:08 +0800
Subject: [PATCH] =?UTF-8?q?v1.7.4=20=E4=BF=AE=E5=A4=8D=E8=BA=AB=E5=AE=AB?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  | 3 +++
 README.md                                     | 2 +-
 README_EN.md                                  | 2 +-
 pom.xml                                       | 2 +-
 src/main/java/com/nlf/calendar/EightChar.java | 7 +++++--
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f61fcf0..70c2c23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,3 +36,6 @@
 ## [1.7.3] - 2025-04-07
 1. 修复个别日太岁方位的错误。
 2. 修复八字身宫计算错误的问题。
+
+## [1.7.4] - 2025-04-29
+1. 修复身宫报错的问题。
diff --git a/README.md b/README.md
index cd0f7af..b01b118 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.7.3</version>
+  <version>1.7.4</version>
 </dependency>
 ```
 
diff --git a/README_EN.md b/README_EN.md
index 78a792e..1abeb17 100644
--- a/README_EN.md
+++ b/README_EN.md
@@ -12,7 +12,7 @@ lunar is a calendar library for Solar and Chinese Lunar.
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.7.3</version>
+  <version>1.7.4</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index e3541e8..8ae4734 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cn.6tail</groupId>
     <artifactId>lunar</artifactId>
     <packaging>jar</packaging>
-    <version>1.7.3</version>
+    <version>1.7.4</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <url>https://github.com/6tail/lunar-java</url>
     <description>a calendar library for Solar and Chinese Lunar</description>
diff --git a/src/main/java/com/nlf/calendar/EightChar.java b/src/main/java/com/nlf/calendar/EightChar.java
index ca464c0..4366139 100644
--- a/src/main/java/com/nlf/calendar/EightChar.java
+++ b/src/main/java/com/nlf/calendar/EightChar.java
@@ -527,12 +527,15 @@ public class EightChar {
   public String getShenGong() {
     int monthZhiIndex = LunarUtil.find(getMonthZhi(), MONTH_ZHI, 0);
     int timeZhiIndex = LunarUtil.find(getTimeZhi(), LunarUtil.ZHI, 0);
-    int offset = (monthZhiIndex + timeZhiIndex - 1) % 12;
+    int offset = monthZhiIndex + timeZhiIndex;
+    if (offset > 12) {
+      offset -= 12;
+    }
     int ganIndex = (lunar.getYearGanIndexExact() + 1) * 2 + offset;
     while (ganIndex > 10) {
       ganIndex -= 10;
     }
-    return LunarUtil.GAN[ganIndex + 1] + MONTH_ZHI[offset + 1];
+    return LunarUtil.GAN[ganIndex] + MONTH_ZHI[offset];
   }
 
   /**