Merge remote-tracking branch 'origin/20230928_pickup' into mp-server-test

mp-service/src/main/java/com/qs/mp/user/domain/UserDeliverOrder.java

@@ -166,5 +166,6 @@ public class UserDeliverOrder implements Serializable {
   private Date updatedTime;
 
   @ApiModelProperty("商品类型:1实物,2卡密")
+  @TableField(exist = false)
   private Integer goodsType;
 }