Merge remote-tracking branch 'origin/main'
# Conflicts: # ruoyi-ui/src/views/statistics/shop/index.vue
This commit is contained in:
commit
fd0237f27c
|
@ -27,10 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateType != null and updateType != ''"> and update_type = #{updateType}</if>
|
||||
<if test="integralUpdateTime != null "> and Integral_update_time = #{integralUpdateTime}</if>
|
||||
<if test="agentRemark != null and agentRemark != ''"> and agent_remark = #{agentRemark}</if>
|
||||
<if test="agentAccount != null">
|
||||
and account in
|
||||
<foreach collection="agentAccount" open="(" close=")" item="account" separator="," index="i">
|
||||
#{account}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="account != null and account != ''"> and account = #{account}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
|
|
@ -370,6 +370,7 @@
|
|||
value-format="yyyy-MM-dd"
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
:picker-options="pickerOptions"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
align="right">
|
||||
|
|
Loading…
Reference in New Issue