Merge remote-tracking branch 'origin/develop_master' into develop_3

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -122,5 +122,7 @@ public class EsRevisePlan extends BasePage {
     @TableField(exist = false)
     private List<String> planStatusList;
 
-
+    @ApiModelProperty(value = "立项单")
+    @TableField("LXD")
+    private String lxd;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java

@@ -56,7 +56,7 @@ public class SarVppsTreeServiceImpl extends ServiceImpl<SarVppsTreeDao, SarVppsT
 
 
         if(parent.getLevel()!=0){
-            sarMenuQueryWrapper.like("VPPS_CODE",parent.getId());
+            sarMenuQueryWrapper.likeRight("VPPS_CODE",parent.getId());
         }
         List<SarVppsTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);