xgxt_sd/zhxg_java
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java
This commit is contained in:
zhy
2025-09-07 22:08:07 +08:00
parent a522a20021 fff3d3c151
commit fd78383f1a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srs-stureg/src/main/java/com/srs/stureg/service/impl/SrsStuRegServiceImpl.java
View File

@@ -1112,9 +1112,9 @@ public class SrsStuRegServiceImpl extends ServiceImpl<SrsStuRegMapper, SrsStuReg
stuReg.setIsRetired(srsStuReg.getIsRetired()); stuReg.setIsRetired(srsStuReg.getIsRetired());
stuReg.setIsFiling(srsStuReg.getIsFiling()); stuReg.setIsFiling(srsStuReg.getIsFiling());
stuReg.setDisableDescript(srsStuReg.getDisableDescript()); stuReg.setDisableDescript(srsStuReg.getDisableDescript());
stuReg.isSmoke = srsStuReg.getIsSmoke(); stuReg.setIsSmoke(srsStuReg.getIsSmoke());
stuReg.isEarly = srsStuReg.getIsEarly(); stuReg.setIsEarly(srsStuReg.getIsEarly());
stuReg.hobby = srsStuReg.getHobby(); stuReg.setHobby(srsStuReg.getHobby());
SrsStuTodo srsStuTodo = new SrsStuTodo(); SrsStuTodo srsStuTodo = new SrsStuTodo();
if (StringUtils.isNotEmpty(srsStuReg.getLoanNo())) { if (StringUtils.isNotEmpty(srsStuReg.getLoanNo())) {

4
srs-stureg/src/main/resources/mapper/stureg/SrsStuRegMapper.xml
View File

@@ -50,6 +50,10 @@
<result property="isFiling" column="is_filing" /> <result property="isFiling" column="is_filing" />
<result property="isDisability" column="is_disability" /> <result property="isDisability" column="is_disability" />
<result property="disableDescript" column="disable_descript" /> <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> </resultMap>
<sql id="selectSrsStuRegVo"> <sql id="selectSrsStuRegVo">