Merge remote-tracking branch 'origin/master'

linwei

2023-12-29 f6332b2e13e9cee67ee30646063e38c403554f89

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

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

   Integer NUMBER_THREE = 3;

   String RESIDENT = "居民";


}