Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 33a80f6b0585a320872477f85a50aa10ca1d20b1

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

@@ -1,11 +1,11 @@
package com.panzhihua.common.model.vos.shop;

import java.math.BigDecimal;
import java.util.List;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @auther lyq