Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-11-17 11899dc62d10c1c7778fbebb631f5ee25705b7db

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java

@@ -94,4 +94,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


    private String address;

}