Merge remote-tracking branch 'origin/main'

# Conflicts:
#	srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java

srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml

@@ -50,6 +50,10 @@
         <result property="isFiling"    column="is_filing"    />
         <result property="isDisability"    column="is_disability"    />
         <result property="disableDescript"    column="disable_descript"    />
+        <result property="disableDescript"    column="disable_descript"    />
+        <result property="isSmoke"    column="is_smoke"    />
+        <result property="isEarly"    column="is_early"    />
+        <result property="hobby"    column="hobby"    />
     </resultMap>
 
     <sql id="selectSrsStuRegVo">