Merge remote-tracking branch 'origin/main'

# Conflicts:
#	jinzhi-lj.java

jinzhi-lj.java

@@ -1,4 +1,4 @@
-class jinzhi_lj {
+public class jinzhi {
     public static void main(String[] args) {
         int a = 15;
         int n = 0;