Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-dependency-common

src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -117,6 +117,7 @@ public enum ErrorCodeEnum {
     FLG_HANDLE_SETTING_NOT_ENABLED_INTO(11120, "当前入库单未开启自动办理参数！"),
     NO_FIND_TRADE(11121, "未找到交易记录，请联系智云管理员"),
     ISEXISTS_BRAVDNAME(11122, "当前商品品牌名称已存在"),
+    ISEXISTS_DATAVALUE(11122, "当前名称已存在"),
     ISEXISTS_UNITNAME(11123, "当前计量单位名称已存在"),
     ISEXISTS_CATNAME(11124, "当前商品系列名称已存在"),
     ISEXISTS_GOODSCATEGORY(11124, "当前商品种类名称已存在"),

src/main/java/com/dk/common/model/response/mst/StaffResponse.java

@@ -262,6 +262,12 @@ public class StaffResponse extends PageInfo<StaffResponse> implements Serializab
     @ApiModelProperty(value = "初始标识")
     private Boolean flgInit;
 
+    /**
+     * 幽灵标识（用于运维查问题）
+     */
+    @ApiModelProperty(value = "幽灵标识（用于运维查问题）")
+    private Boolean flgGhost;
+
     @ApiModelProperty(value = "系统版本")
     private String gradeCode;
     /**

src/main/java/com/dk/common/model/vo/mst/StaffVO.java

@@ -137,6 +137,13 @@ public class StaffVO extends PageInfo<StaffVO> implements Serializable {
     private Boolean flgInit;
 
     /**
+     * 幽灵标识（用于运维查问题）
+     */
+    @Excel(name = "幽灵标识（用于运维查问题）")
+    @ApiModelProperty(value = "幽灵标识（用于运维查问题）")
+    private Boolean flgGhost;
+
+    /**
      * 部门
      */
     @Excel(name = "部门", width = 20)