Merge remote-tracking branch 'origin/master'

linwei

2023-12-29 43b63baf216cd1b257bf476da1ffa6104ddffb06

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

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

   Integer NUMBER_THREE = 3;

   String RESIDENT = "居民";


}