@@ -56,13 +56,13 @@ public class JYOrderItemList{
/**
* 预估收入
*/
- @Excel(name = "预估收入")
+// @Excel(name = "预估收入")
private BigDecimal mcnPromotionAmount;
* 总出单量
- @Excel(name = "总出单量")
+// @Excel(name = "总出单量")
private Long totalOrderNum;
@@ -217,7 +217,7 @@
and date_format(first_order_time,'%Y-%m-%d') <= #{endDate}
</if>
</where>
- order by first_order_time desc
+ order by first_order_time desc,item_id
</select>
<select id="itemList" resultType="com.alibaba.fastjson.JSONObject">