From 34469699a5af8a44bc09c88a6f36f6c8dfdab679 Mon Sep 17 00:00:00 2001
From: Weidge <Weidge@github.com>
Date: Sat, 1 Jan 2022 15:17:30 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=8D?=
 =?UTF-8?q?=E6=8E=A8=E5=85=AB=E5=AD=97Solar=5FfromBaZi=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E9=98=B3=E5=8E=86=E5=85=83=E6=97=A6=E5=90=8E?=
 =?UTF-8?q?=E3=80=81=E5=86=9C=E5=8E=86=E6=96=B0=E5=B9=B4=E5=89=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=8D=E6=8E=A8=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lunar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lunar.js b/lunar.js
index 534851b..c733f57 100644
--- a/lunar.js
+++ b/lunar.js
@@ -304,7 +304,7 @@
       if(offsetYear<0){
         offsetYear = offsetYear+60;
       }
-      var startYear = today.getYear() - offsetYear;
+      var startYear = lunar.getYear() - offsetYear;
       var hour = 0;
       var timeZhi = timeGanZhi.substr(1);
       for(var i=0,j=LunarUtil.ZHI.length;i<j;i++){
@@ -366,7 +366,7 @@
       fromYmdHms:function(y,m,d,hour,minute,second){return _fromYmdHms(y,m,d,hour,minute,second);},
       fromDate:function(date){return _fromDate(date);},
       fromJulianDay:function(julianDay){return _fromJulianDay(julianDay);},
-      fromBaZi:function(yearGanZhi,monthGanZhi,dayGanZhi,timeGanZhi){return _fromBaZi(yearGanZhi,monthGanZhi,dayGanZhi,timeGanZhi);}
+      fromBaZi:function(yearGanZhi,monthGanZhi,dayGanZhi,timeGanZhi,sect,baseYear){return _fromBaZi(yearGanZhi,monthGanZhi,dayGanZhi,timeGanZhi,sect,baseYear);}
     };
   })();
   var Lunar = (function(){