Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

# Conflicts:
#	project_data/sql/0.0.5/soc/soc.sql

project_data/sql/0.0.5/soc/soc.sql

@@ -1,9 +1,13 @@
 DELIMITER ??
 DROP PROCEDURE
     IF
-        EXISTS schema_change ?? CREATE PROCEDURE schema_change () BEGIN
-	
-		IF NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'core_safety_task' AND COLUMN_NAME = 'solid_id' ) THEN
+    NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'sys_org' AND COLUMN_NAME = 'breviary' ) THEN
+ALTER TABLE `sys_org` ADD COLUMN `breviary` VARCHAR ( 255 ) NULL COMMENT '机构缩略词';
+
+END IF;
+
+	IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'core_safety_task' AND COLUMN_NAME = 'solid_id' ) THEN
         ALTER TABLE  `core_safety_task`
 					ADD COLUMN `solid_id` bigint NULL COMMENT '固定的id,用于识别多个副本是否属于同一个计划' AFTER `plan_id`;
     END IF;

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrg.java

@@ -141,8 +141,8 @@ public class SysOrg extends BaseEntity {
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "tree_parent_code")
     private String treeParentCode;
-
-
+    @ApiModelProperty(value = "机构缩略词")
+    private String breviary;
     /**
      * 子机构
      */
@@ -174,6 +174,7 @@ public class SysOrg extends BaseEntity {
                 .append("source", getSource())
                 .append("createBy", getCreateBy())
                 .append("updateBy", getUpdateBy())
+                .append("breviary",getBreviary())
                 .toString();
     }
 }