v1.3.10 修复八字转阳历为空的问题;修复一处法定假日数据错误;十神优化。
This commit is contained in:
@@ -298,7 +298,7 @@ public class Solar {
|
||||
List<Solar> l = new ArrayList<Solar>();
|
||||
List<Integer> years = new ArrayList<Integer>();
|
||||
Solar today = fromDate(new Date());
|
||||
int offsetYear = LunarUtil.getJiaZiIndex(today.getLunar().getYearInGanZhiExact())-LunarUtil.getJiaZiIndex(yearGanZhi);
|
||||
int offsetYear = (today.getYear() - 4) % 60 - LunarUtil.getJiaZiIndex(yearGanZhi);
|
||||
if(offsetYear < 0){
|
||||
offsetYear += 60;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user