Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20200514-zlp-1

Browse Source 
有个冲突
This commit is contained in:
paidaxing444
2020-05-14 08:59:06 +08:00
parent 8564eeae7b
commit 0077611aa7
2 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
View File

@ -16,6 +16,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="stylecolor" column="stylecolor" />
<result property="createuserid" column="createuserid" />
<result property="createtime" column="createtime" />
<association property="byClass" column="bjbh" javaType="ByClass" resultMap="ByClassResult" />
</resultMap>
<resultMap type="ByClass" id="ByClassResult">
<result property="bjbh" column="bjbh"/>
<result property="deptId" column="dept_id"/>
<result property="bjtype" column="bjtype"/>
<result property="bhxh" column="bhxh"/>
<result property="xn" column="xn"/>
<result property="bjmc" column="bjmc"/>
<result property="bjrych" column="bjrych"/>
<result property="jbny" column="jbny"/>
<result property="zbjs" column="zbjs"/>
<result property="zbjsxm" column="zbjsxm"/>
<result property="pbjs" column="pbjs"/>
<result property="pbjsxm" column="pbjsxm"/>
<result property="zljs" column="zljs"/>
<result property="zljsxm" column="zljsxm"/>
<result property="isdel" column="isdel"/>
<result property="createtime" column="createtime"/>
</resultMap>
<sql id="selectBySchoolcalendarClassVo">