record basic knowlege

Acgelababy · Acgelababy · commit d5fdaa8d7eb3 · 2022-04-29T15:57:05.000+08:00
diff --git a/languages/java/basic/basic.md b/languages/java/basic/basic.md
@@ -2,7 +2,7 @@
 
 java&#25968;&#25454;&#20998;&#20026;&#20004;&#31181;&#65306;&#22522;&#26412;&#25968;&#25454;&#31867;&#22411;&#65288;Primitive Type&#65289;&#21644;&#24341;&#29992;&#25968;&#25454;&#31867;&#22411;&#65288;Reference Type&#65289;
 
-![basicdatatype.png](./assets/basic-data-type.png)
+![](https://picturestr.oss-cn-shanghai.aliyuncs.com/javaseniorengineer/language/java/basic/202204291555779.png)
 
 ### 1.1 &#22522;&#26412;&#25968;&#25454;&#31867;&#22411;
 
@@ -412,3 +412,11 @@ https://www.cnblogs.com/wuhenzhidu/p/anonymous.html
 &#37027;&#20123;&#26159;&#31867;&#24517;&#39035;&#26159;&#23454;&#29616;&#30340;&#26041;&#27861;
 &#25509;&#21475;&#20063;&#21487;&#20197;&#23454;&#29616;&#26041;&#27861;&#65292;&#28982;&#21518;&#31867;&#26159;&#21542;&#33021;&#22815;&#37325;&#26032;&#23454;&#29616;&#26041;&#27861;
 
+&#20301;&#36816;&#31639;&#30340;&#20351;&#29992;&#22330;&#26223;
+https://blog.csdn.net/qq_39314099/article/details/110482069
+
+
+import &#23548;&#20837;&#26426;&#21046;
+
+jar&#26159;&#24590;&#20040;&#21629;&#21517;&#30340;
+
diff --git a/languages/java/open-source-framework/persistence-framework/mybatis/applications/mapperxml.md b/languages/java/open-source-framework/persistence-framework/mybatis/applications/mapperxml.md
@@ -1,3 +1,6 @@
 foreach&#30340;&#20351;&#29992;
 
-gro.name ~ #{keywork}
+gro.name ~ #{keywork}
+
+
+association
diff --git a/tools/git/basic.md b/tools/git/basic.md
@@ -1,3 +1,19 @@
 &#20026;&#20160;&#20040;&#22312;&#21478;&#19968;&#20010;&#20998;&#25903;git pull dev
 
 &#20250;&#21047;&#26032;&#33258;&#24049;&#30340;&#25991;&#20214;
+
+bb3a41d7 HEAD@{8}: commit: fix(gis-api):
+df9e2c0d (dev) HEAD@{11}: merge liyuanbo: Fast-forward
+ad1a36fc HEAD@{12}: pull --no-stat -v --progress origin dev: Fast-forward
+a40e839d HEAD@{13}: checkout: moving from liyuanbo to dev
+
+
+e78b8e46 (HEAD -> liyuanbo, origin/liyuanbo) HEAD@{0}: reset: moving to HEAD
+e78b8e46 (HEAD -> liyuanbo, origin/liyuanbo) HEAD@{1}: reset: moving to HEAD
+e78b8e46 (HEAD -> liyuanbo, origin/liyuanbo) HEAD@{2}: commit: fix(gis-api):
+
+
+https://www.cnblogs.com/flying_bat/p/3408634.html
+
+
+&#26597;&#30475;&#21382;&#21490;&#35760;&#24405;git reflog

-Original file line number
+Diff line change
 java数据分为两种：基本数据类型（Primitive Type）和引用数据类型（Reference Type）
 -![basicdatatype.png](./assets/basic-data-type.png)
 +![](https://picturestr.oss-cn-shanghai.aliyuncs.com/javaseniorengineer/language/java/basic/202204291555779.png)
 ### 1.1 基本数据类型
 那些是类必须是实现的方法
 接口也可以实现方法，然后类是否能够重新实现方法
 +位运算的使用场景
 +https://blog.csdn.net/qq_39314099/article/details/110482069
++
++
 +import 导入机制
++
 +jar是怎么命名的
++