Merge remote-tracking branch 'origin/master'

linwei

2024-01-08 ea3c7c83c3d8338894d1a7e266784778dcdca7b5

 src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -88,5 +88,7 @@

   Integer NUMBER_THREE = 3;

   String RESIDENT = "居民";


}