yanghui
2022-11-28 07b19970e4223ed7c75ec6473a511458d76cdb01
Merge branch 'local_20221104' into huacheng_test
2个文件已修改
10 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java
@@ -64,4 +64,10 @@
    @ApiModelProperty(value = "自提点信息")
    private ConvenientElevatingPointVO convenientElevatingPointVO;
    @ApiModelProperty(value = "物流单号")
    private String logisticsNo;
    @ApiModelProperty(value = "物流公司")
    private String logisticsCompany;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml
@@ -159,7 +159,9 @@
            a.city_name,
            a.district_name,
            a.detail_address,
            o.point_id
            o.point_id,
            o.logistics_company,
            o.logistics_no
            FROM
                com_shop_flower_order o
                LEFT JOIN com_shop_flower_order_goods g ON o.id = g.order_id