admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev_js_20260323'

Browse Source
This commit is contained in:
king
2026-03-23 19:12:27 +08:00
parent 70aac257c0 8e4b6326b6
commit 8d59bd9dd9
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggMonthCount.java
View File

@@ -151,10 +151,10 @@ public class NewGrBiSaAggMonthCount implements Serializable
@TableField(value = "thissamoney_s")
private BigDecimal thissamoney_s;
private BigDecimal thisMonthSaMoney_s;
@TableField(value = "thisprofit_s")
private BigDecimal thisprofit_s;
private BigDecimal thisMonthProfit_s;
}

4
lidee-core/src/main/java/com/lideeyunji/core/framework/entity/NewGrBiSaAggYearCount.java
View File

@@ -146,9 +146,9 @@ public class NewGrBiSaAggYearCount implements Serializable
private BigDecimal thisYearProfitChange;
@TableField(value = "this_year_sa_money_s")
private BigDecimal thisYearSaMoney_s;
private BigDecimal thissamoney_s;
@TableField(value = "this_year_profit_s")
private BigDecimal thisYearProfit_s;
private BigDecimal thisprofit_s;
}

4
lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
View File

@@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="lastMonthProfitShare" column="last_month_profit_share" />
<result property="thisMonthSaMoneyShare" column="this_month_sa_money_share" />
<result property="thisMonthProfitShare" column="this_month_profit_share" />
<result property="thissamoney_s" column="thissamoney_s" />
<result property="thisprofit_s" column="thisprofit_s" />
<result property="thisMonthSaMoney_s" column="thissamoney_s" />
<result property="thisMonthProfit_s" column="thisprofit_s" />
</resultMap>
<sql id="selectNewGrBiSaAggMonthCountVo">

4
lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml
View File

@@ -37,8 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="thisYearSaMoneyGrowth" column="this_year_sa_money_growth" />
<result property="thisYearProfitGrowth" column="this_year_profit_growth" />
<result property="thisYearProfitChange" column="this_year_profit_change" />
<result property="thisYearSaMoney_s" column="this_year_sa_money_s" />
<result property="thisYearProfit_s" column="this_year_profit_s" />
<result property="thissamoney_s" column="this_year_sa_money_s" />
<result property="thisprofit_s" column="this_year_profit_s" />
</resultMap>
<sql id="selectNewGrBiSaAggYearCountVo">