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

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/serviceItemsManage/entity/ServiceItemsManage.java

@@ -53,6 +53,8 @@ public class ServiceItemsManage extends BaseVOEntity{
     @ApiModelProperty("备注")
     @Excel(name = "备注")
     private String remark;
+    @ApiModelProperty("服务项编码nc")
+    @Excel(name = "服务项编码nc")
+    private String serviceItemsCodeNc;
 
-
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/serviceItemsManage/repository/po/ServiceItemsManagePO.java

@@ -59,4 +59,8 @@ public class ServiceItemsManagePO extends BaseVOEntity{
 
     private String costType;
 
-}
+    @ApiModelProperty("服务项编码nc")
+    @Excel(name = "服务项编码nc")
+    private String serviceItemsCodeNc;
+
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/serviceItemsManage/repository/todo/ServiceItemsManageDO.java

@@ -53,6 +53,10 @@ public class ServiceItemsManageDO extends BaseVOEntity{
     @Excel(name = "备注")
     private String remark;
 
+    @ApiModelProperty("服务项编码nc")
+    @Excel(name = "服务项编码nc")
+    private String serviceItemsCodeNc;
+
     @ApiModelProperty(name = "组织ID集合")
     private List<Long> organizationIdList;
 
@@ -68,4 +72,5 @@ public class ServiceItemsManageDO extends BaseVOEntity{
     private String updateTimeStart;
     @ApiModelProperty(name = "修改时间查询条件结束日期")
     private String updateTimeEnd;
-}
+
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/serviceItemsManage/ServiceItemsManageDTO.java

@@ -61,4 +61,8 @@ public class ServiceItemsManageDTO extends BaseVOEntity{
 
     @ApiModelProperty("服务项管理ids")
     private String serviceItemsManageIds;
-}
+
+    @ApiModelProperty("服务项编码nc")
+    @Excel(name = "服务项编码nc")
+    private String serviceItemsCodeNc;
+}