Merge remote-tracking branch 'origin/master'

lin

2024-02-26 88de0b5169112f8ea908cc2c048bc34286f8851d

 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 = "居民";