Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

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

@@ -88,6 +88,10 @@

   Integer NUMBER_THREE = 3;

   Integer NUMBER_FOUR = 4;

   Integer NUMBER_EIGHT = 8;

   String RESIDENT = "居民";