Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-06 a18634e047b46e411dac268a0b3a995c22053ea5

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

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

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

@Data
@ApiModel("订单操作日志")