wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-12-13 10:23:03 +08:00
parent a85552322e eb5c316eab
commit aec5088067
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/demanData/dto/TDemandDataDTO.java
View File

@ -43,8 +43,10 @@ public class TDemandDataDTO extends AuditingBaseDTO implements Serializable {
private String detailsField; private String detailsField;
private Long creator; private Long creator;
private Date createDate; private Date createDate;
@ApiModelProperty(value = "附件") @ApiModelProperty(value = "附件名称")
private String enclosure; private String enclosure;
@ApiModelProperty(value = "附件")
private String enclosureName;
@ApiModelProperty(value = "业务标志（0:初始化 1:审批中 2:审批拒绝 3:审批通过）") @ApiModelProperty(value = "业务标志（0:初始化 1:审批中 2:审批拒绝 3:审批通过）")
private Integer flag; private Integer flag;
@ApiModelProperty(value = "业务标志提示（0:初始化 1:审批中 2:审批拒绝 3:审批通过）") @ApiModelProperty(value = "业务标志提示（0:初始化 1:审批中 2:审批拒绝 3:审批通过）")

5
renren-admin/src/main/java/io/renren/modules/demanData/entity/TDemandDataEntity.java
View File

@ -57,6 +57,11 @@ public class TDemandDataEntity extends BaseEntity {
* 附件 * 附件
*/ */
private String enclosure; private String enclosure;
/**
* 附件名称
*/
private String enclosureName;
/** /**
* 业务标志（0:初始化 1:审批中 2:审批拒绝 3:审批通过） * 业务标志（0:初始化 1:审批中 2:审批拒绝 3:审批通过）
*/ */

1
renren-admin/src/main/resources/mapper/demanData/TDemandDataDao.xml
View File

@ -23,6 +23,7 @@
<result property="approvalUserDeptName" column="approval_user_dept_name"/> <result property="approvalUserDeptName" column="approval_user_dept_name"/>
<result property="visits" column="visits"/> <result property="visits" column="visits"/>
<result property="applyNumber" column="apply_number"/> <result property="applyNumber" column="apply_number"/>
<result property="enclosureName" column="enclosure_name" />
</resultMap> </resultMap>
<update id="updateInstanceId"> <update id="updateInstanceId">