代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/EnrollUserByAppDTO.java

@@ -17,7 +17,7 @@
    /**
     * 是否是自己（1.是 2.否）
     */
    public interface isUser{
    public interface isUser {
        int yes = 1;
        int no = 2;
    }