diff --git a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml index f2770e1..28c3a76 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml @@ -27,10 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_type = #{updateType} and Integral_update_time = #{integralUpdateTime} and agent_remark = #{agentRemark} + and account in #{account} + and account = #{account} diff --git a/ruoyi-ui/src/views/statistics/shop/index.vue b/ruoyi-ui/src/views/statistics/shop/index.vue index 57d924c..a280922 100644 --- a/ruoyi-ui/src/views/statistics/shop/index.vue +++ b/ruoyi-ui/src/views/statistics/shop/index.vue @@ -370,6 +370,7 @@ value-format="yyyy-MM-dd" type="daterange" range-separator="至" + :picker-options="pickerOptions" start-placeholder="开始日期" end-placeholder="结束日期" align="right">