Merge remote-tracking branch 'origin/master'

feige

2024-10-18 98cd4713254614381ede8fa42d0820a3ffc1d53e

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

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

    private String url;


}