代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java

@@ -14,6 +14,8 @@
@Data
public class ExportMerchantVO {

    private Long id;

    @ExcelProperty("商家名称")
    private String name;