Skip to content

L
long-tern-care-service
Commit 5bd7d9e9 authored by 蔡镇泽's avatar 蔡镇泽
Browse files
Options

Merge remote-tracking branch 'origin/master'

# Conflicts: # common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoVO.java
parents 166419ac cbe0c40b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoVO.java
View file @ 5bd7d9e9
...@@ -47,4 +47,4 @@ public class SrvTaskInfoVO implements Serializable { ...@@ -47,4 +47,4 @@ public class SrvTaskInfoVO implements Serializable {
* 服务计划状态 * 服务计划状态
*/ */
private String taskStatus; private String taskStatus;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment