Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

昨天 d730e2a289b38356e28a04b35a0cb2e7b4c6c282

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilDto.java

@@ -21,6 +21,12 @@
    public String id;

    /**
     * 墒情站FBox序列号
     */
    @NotEmpty(message = "墒情站FBox序列号") //不能为空也不能为null
    public String fboxId;

    /**
     * 墒情站名称
     */
    @NotEmpty(message = "墒情站名称不能为空") //不能为空也不能为null
@@ -49,6 +55,7 @@

    public PrStSoil toNewPo(){
        PrStSoil po = new PrStSoil();
        po.fboxId = this.fboxId;
        po.name = this.name;
        po.no = this.no;
        po.lng = this.lng;