Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

@@ -88,5 +88,13 @@

   Integer NUMBER_THREE = 3;

   Integer NUMBER_FOUR = 4;

   Integer NUMBER_EIGHT = 8;

   Integer NUMBER_SEVEN = 7;

   String RESIDENT = "居民";


}