Merge remote-tracking branch 'origin/master'

linwei

2024-01-24 e20d75414b3c2bca00fb4d780fc3445c9df09197

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

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

   Integer NUMBER_THREE = 3;

   String RESIDENT = "居民";


}