feat(all): 配送明细报表

1 增加品牌字段查询

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml

@@ -980,6 +980,9 @@
             <if test="query.stockArticleId != null and query.stockArticleId != null">
                 and order_code = #{query.stockArticleId}
             </if>
+            <if test="query.brandName != null and query.brandName != null">
+                and brand_name = #{query.brandName}
+            </if>
             <if test="query.orderPackageCode != null and query.orderPackageCode != null">
                 and order_package_code = #{query.orderPackageCode}
             </if>

blade-service/logpm-report/src/main/java/com/logpm/report/query/DevilerDetailsQuery.java

@@ -62,4 +62,7 @@ public class DevilerDetailsQuery extends Query {
 	@ApiModelProperty(value = "包条码")
 	private String orderPackageCode;
 
+	@ApiModelProperty(value = "品牌")
+	private String brandName;
+
 }