Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 c5cb162b5cbdb589e97290fba3ac3e9241ec48d4

 cloud-server-activity/src/main/java/com/dsh/activity/entity/UserPointsMerchandise.java

@@ -68,7 +68,26 @@
     */
    @TableField("insertTime")
    private Date insertTime;

    /**
     * 现金支付方式(1=微信2支付宝)
     */
    @TableField("payType")
    private Integer payType;
    /**
     * code
     */
    @TableField("code")
    private String code;
    /**
     * orderNumber
     */
    @TableField("orderNumber")
    private String orderNumber;
    /**
     * 现金的支付状态
     */
    @TableField("payStatus")
    private Integer payStatus;

    @Override
    protected Serializable pkVal() {