Merge remote-tracking branch 'origin/main'

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/roommodel/vo/ResourceRoomModelRespVO.java

@@ -27,6 +27,10 @@ public class ResourceRoomModelRespVO {
     @ExcelProperty("房型名称")
     private String name;
 
+    @Schema(description = "房型简称")
+    @ExcelProperty("房型简称")
+    private String shortName;
+
     @Schema(description = "房型编码")
     @ExcelProperty("房型编码")
     private String code;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/roommodel/vo/ResourceRoomModelSaveReqVO.java

@@ -17,6 +17,9 @@ public class ResourceRoomModelSaveReqVO {
     @Schema(description = "房型名称", example = "王五")
     private String name;
 
+    @Schema(description = "房型简称")
+    private String shortName;
+
     @Schema(description = "房型编码")
     private String code;
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/roommodel/ResourceRoomModelDO.java

@@ -34,6 +34,11 @@ public class ResourceRoomModelDO extends TenantBaseDO {
      * 房型名称
      */
     private String name;
+
+    /**
+     * 房型简称
+     */
+    private String shortName;
     /**
      * 房型编码
      */