代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/AddGroup.java

@@ -6,5 +6,4 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-18 17:35
 **/
public interface AddGroup {
}
public interface AddGroup {}