Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

昨天 2323e7ce37d12a689f00948a54d79f24a9b37561

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/InTaskMsgDto.java

@@ -6,7 +6,7 @@
public class InTaskMsgDto {
    private String sourceStaNo;

    private Integer staNo;
    private String staNo;

    private Integer deviceNo;