Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-31 945c7091d1db4e156a7a2b5ccd24c888cbce40a5

 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 {