Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ProfilerStandardSectionBean.java

@@ -74,7 +74,7 @@ public class ProfilerStandardSectionBean {
      * 圆心z（米）
      */
     @ApiModelProperty("圆心z（米）")
-    private String y;
+    private String z;
 
     /**
      *  创建时间

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/profiler/ProfilerSectionPush.java

@@ -45,7 +45,7 @@ public class ProfilerSectionPush {
             sectionPush.setStart_angle(f.getStartAngle());
             sectionPush.setRadius(f.getRadius());
             sectionPush.setCenter_x(f.getX());
-            sectionPush.setCenter_y(f.getY());
+            sectionPush.setCenter_y(f.getZ());
             return sectionPush;
         }).collect(Collectors.toList());
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -1020,7 +1020,7 @@
     <select id="getWbsContractSubdivision" resultType="org.springblade.manager.vo.APIWbsContractSubdivisionVo">
         SELECT
             p_key_id id,
-            p_key_id code,
+            partition_code code,
             IFNULL(if(length(trim(full_name))>0,full_name,node_name),node_name) name,
             null stake,
             case