ec4a8e32e24bb8e0cd72e7902af59e2fef9fd47c..fb8b419852d63782681a7ce4681f72c6fd47a96b
2024-09-23 cloudroam
Merge remote-tracking branch 'origin/master-v2' into master-v2
fb8b41 对比 | 目录
2024-09-23 cloudroam
add:增加库位和库位搜索
99d6b7 对比 | 目录
已修改2个文件
6 ■■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/payment/OrderMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
@@ -76,4 +76,7 @@
    @ApiModelProperty(hidden = true)
    private boolean customerQuery = false;
    @ApiModelProperty(value = "库位")
    private String warehouseLocationCode;
}
src/main/resources/mapper/payment/OrderMapper.xml
@@ -145,6 +145,9 @@
                and oi.flower_name LIKE concat('%', #{condition.flowerName},'%')
            )
        </if>
        <if test="condition.warehouseLocationCode != null and condition.warehouseLocationCode != ''">
            AND q.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
        </if>
        ORDER BY q.create_time desc, q.payment_time desc
    </select>