Merge remote-tracking branch 'origin/master'

This commit is contained in:
曹磊 2025-11-11 09:49:53 +08:00
commit b4774e380a
1 changed files with 4 additions and 0 deletions

View File

@ -47,6 +47,8 @@
<result property="typeName" column="cst_type_name" />
<result property="previewFile" column="preview_file"/>
<result property="immediateFile" column="immediate_file"/>
<result property="cycleTypeShow" column="cycleTypeShow"/>
<result property="cycleTypeValue" column="cycleTypeValue"/>
<!-- 关联的体型标签列表 -->
<collection property="bodyTagList" ofType="com.nu.modules.directivetag.body.entity.DirectiveBodyTag">
<id property="id" column="tag_id" />
@ -95,6 +97,8 @@
dp.start_time_str,
dp.end_time_str,
dp.instruction_tag_id,
pd.cycle_type AS cycleTypeShow,
pd.cycle_value AS cycleTypeValue,
dp.total_duration,
csd.id AS directive_id,
csd.directive_name,