处理冲突

src/main/java/com/uas/ps/product/service/ProductService.java

@@ -368,5 +368,4 @@ public interface ProductService {
      * @return
      */
     Long countByEnUU(Long enUU);
->>>>>>>>> Temporary merge branch 2
 }