Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-05-24 d4203b001b70bb9bc2af8358f0800b952f3521c5

 phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java

@@ -1,16 +1,15 @@
package com.hz.phis.dt.promotion;

/**促销扩展*/

import lombok.Data;

/**
 * 促销详情实体
 *
 * @author fwq
 */
@Data
public class PromotionDt {

    /**更新时间*/
    private String editTime;

    public String getEditTime() {
        return editTime;
    }

    public void setEditTime(String editTime) {
        this.editTime = editTime;
    }
    private PromotionDeLimitDt promotion;
    private String id;
}