Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/contract/SettleRelaConfigVO.java

@@ -18,14 +18,14 @@ public class SettleRelaConfigVO {
     @ApiModelProperty(value = "所属公司编号")
     private String belongCompanyCode;
 
-    @ZfireField(tbName = "b", colName = "name")
+    @ZfireField(tbName = "b", colName = "name", ignoreSelect = true)
     @ApiModelProperty(value = "上级网点名称")
     private String parentName;
 
     @ApiModelProperty(value = "上级网点编号")
     private String websitId;
 
-    @ZfireField(tbName = "d", colName = "name")
+    @ZfireField(tbName = "d", colName = "name", ignoreSelect = true)
     @ApiModelProperty(value = "下级网点名称")
     private String subName;