Merge remote-tracking branch 'origin/master'

lin

2024-04-11 41f51aa3910dac6b8da3d21e57ac1130caac994a

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

@@ -93,6 +93,7 @@
   Integer NUMBER_EIGHT = 8;

   Integer NUMBER_SEVEN = 7;
   Integer NUMBER_SIX = 6;

   String RESIDENT = "居民";