Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-09-10 08adf7ea8fa66b488e52335dbb3efb23bff67792

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderInvoiceQuery.java

@@ -25,6 +25,8 @@

    @ApiModelProperty(value = "开票方式（1=人工，2=自动）")
    private Integer invoicingMethod;
    @ApiModelProperty(value = "状态（1=待开票，2=开票中，3=已开票）")
    private Integer status;

    @ApiModelProperty(value = "申请人电话")
    private String userPhone;

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml

@@ -49,6 +49,9 @@
            <if test="query.invoicingObjectType != null">
                AND toi.invoicing_object_type = #{query.invoicingObjectType}
            </if>
            <if test="query.status != null">
                AND toi.status = #{query.status}
            </if>
            <if test="query.invoiceMaterial != null">
                AND toi.invoice_material = #{query.invoiceMaterial}
            </if>