Merge remote-tracking branch 'origin/master'

feige

2024-08-28 8429b26635252973e325d020af1a4485a0bbfdb0

 zhang-content/src/main/java/com/ruoyi/domain/ZYearInfo.java

@@ -88,5 +88,4 @@

    private String url;


}