Merge branch 'master' into 1027-master

liusheng

8 天以前 0f22f66ae9d2156b983f533beb17a0062a949524

 smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetail.java

@@ -23,7 +23,7 @@
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    private String id;
    private Long id;

    @ApiModelProperty(value = "子任务ID")
    private Long subId;