Merge branch 'test' into 'test_bak'

罗元桥

2021-09-07 4b50ee7687be0c63bb5639156e4a3f6a15aaf37a

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

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

import java.math.BigDecimal;

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

import java.math.BigDecimal;

@Data
@ApiModel("订单创建返回参数")