Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java

@@ -132,4 +132,11 @@ public class SysTaskPlan extends BaseBean {
     @Column(name = "NOTICE_CHANNEL")
     @ApiParam(value = "通知渠道")
     private String noticeChannel;
+
+    public int getTaskPlanStatusVal() {
+        if(taskPlanStatus != null){
+            return taskPlanStatus.intValue();
+        }
+        return taskPlanStatus;
+    }
 }