Merge branch 'test' into 'master'

罗元桥

2021-09-07 a0f6c9c91b61503a97a17fe2ecc2775afb75fda1

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

@@ -4,9 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel("订单创建返回参数")
public class ComShopSysConfVO {