Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -88,6 +88,12 @@

   Integer NUMBER_THREE = 3;

   Integer NUMBER_FOUR = 4;

   Integer NUMBER_EIGHT = 8;

   Integer NUMBER_SEVEN = 7;

   String RESIDENT = "居民";