代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/TemplateData.java

@@ -7,11 +7,11 @@

    private String value;

    public TemplateData(String value){
    public TemplateData(String value) {
        this.value = value;
    }

    public TemplateData(){
    public TemplateData() {

    }
}