Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 a0f33f915dd4128d98111f67a3c75b1676adae32

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.dtos.shop;

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

import io.swagger.annotations.ApiModel;