Merge remote-tracking branch 'origin/master'

# Conflicts: # common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoVO.java

Merge remote-tracking branch 'origin/master'
5bd7d9e9 · 蔡镇泽 · 166419ac · cbe0c40b · 5bd7d9e9
Commit 5bd7d9e9 authored May 08, 2021 by 蔡镇泽
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

SrvTaskInfoVO.java ...va/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoVO.java +1 -2

No files found.
--- a/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoVO.java
+++ b/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoVO.java
@@ -47,4 +47,4 @@ public class SrvTaskInfoVO implements Serializable {
     * 服务计划状态
     */
    private String taskStatus;
-}
\ No newline at end of file
+}