zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:5b9b503f333ade5c4ae9901a4299f4250c6fcb82
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
..
compare: zenghuapei:1351a9a0753f86a7e155d94ea7f7211f1fbba68b
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

No commits in common. "5b9b503f333ade5c4ae9901a4299f4250c6fcb82" and "1351a9a0753f86a7e155d94ea7f7211f1fbba68b" have entirely different histories.
5b9b503f33 ... 1351a9a075

2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java
View File

@ -18,7 +18,7 @@ public class PromoterDrawReqVO extends PageParam {
private Long tenantId; private Long tenantId;
@Schema(description = "商户名称") @Schema(description = "组织名称")
private String deptName; private String deptName;
@Schema(description = "组织结构名称") @Schema(description = "组织结构名称")
private String parentOrganizationName; private String parentOrganizationName;

4
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -40,10 +40,10 @@
<if test="data.nickname!=null and data.nickname!=''"> <if test="data.nickname!=null and data.nickname!=''">
and d.nickname=#{data.nickname} and d.nickname=#{data.nickname}
</if> </if>
<if test="data.createTime !=null and data.createTime.length>=1"> <if test="data.createTime !=null ">
and a.create_time &gt;=#{data.createTime[0]} and a.create_time &gt;=#{data.createTime[0]}
</if> </if>
<if test="data.createTime !=null and data.createTime.length>=2"> <if test="data.createTime !=null ">
and a.create_time &lt;=#{data.createTime[1]} and a.create_time &lt;=#{data.createTime[1]}
</if> </if>
</where> </where>