代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

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

@@ -6,5 +6,4 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-30 13:47
 **/
public interface PageGroup {
}
public interface PageGroup {}