Merge a8c6d6aa5d04bde8664772385a2d7adb50bbfa18 into b25dec74f96279871151623bd6a182c1ea877e6a

Bumps [fastjson](https://github.com/alibaba/fastjson) from 1.2.47 to 1.2.83.
- [Release notes](https://github.com/alibaba/fastjson/releases)
- [Commits](https://github.com/alibaba/fastjson/compare/1.2.47...1.2.83)

---
updated-dependencies:
- dependency-name: com.alibaba:fastjson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitattributes

@@ -1,3 +1,6 @@
 *.js linguist-language=Java
 *.css linguist-language=Java
 *.html linguist-language=jsp
+
+
+

.gitignore

@@ -38,4 +38,6 @@ nbdist/
 ### 屏蔽，需要完整代码联系博主：微信847064370
 *.html
 /templates
-webapp/
+
+
+

README.md

@@ -1,7 +1,12 @@
-最新消息，博主已开通B站账号：[Java刘哥](https://space.bilibili.com/160340478)，欢迎关注，分享自己原创免费Java实战课程、各种框架实战和技巧、以及公司项目经验
+最新消息，博主已开通B站账号：[Java刘哥](https://space.bilibili.com/160340478)
 <hr/>
-## 博主开发的其他酒店系统全部在这里
-**[https://liuyanzhao.com/shop.html?k=酒店](https://liuyanzhao.com/shop.html?k=酒店)**  
+
+## 博主开发的其他项目或者酒店项目都在此
+**[https://liuyanzhao.com/shop.html](https://liuyanzhao.com/shop.html)**  
+**[https://liuyanzhao.com/shop.html?k=酒店](https://liuyanzhao.com/shop.html?k=酒店)** 
+- [基于SpringBoot Vue 酒店管理系统 酒店预订管理系统 Hotux的Vue版本](https://liuyanzhao.com/shop/hotel-vue.html)
+- [基于SpringBoot/SSM的酒店预订管理系统，已对接支付宝沙箱支付atoli](https://liuyanzhao.com/shop/atoli.html)
+- [基于SpringBoot酒店管理系统,已对接支付宝沙箱支付hotux](https://liuyanzhao.com/shop/springboot-hotel.html)
 - -------------------------------------------------------------------------------
 # SpringBoot酒店管理系统
 基于SpringBoot实现的酒店管理系统，包括三种角色：管理员、酒店工作人员、客户。
@@ -13,11 +18,6 @@
 预览地址：[http://hotel.liuyanzhao.com](http://hotel.liuyanzhao.com) <br/>
 已录制2小时的代码讲解视频
 
-- 最新消息 2022 最新租房系统地址：[2022 基于SpringBoot的房屋租赁平台 房屋展示平台 留学生房屋租赁平台](https://github.com/saysky/HouseKey)
-- SSM租房系统[https://github.com/saysky/verio](https://github.com/saysky/verio)
-- SpringBoot租房系统[https://github.com/saysky/verio-boot](https://github.com/saysky/verio-boot)
-- SpringBoot租房系统[https://github.com/saysky/manland](https://github.com/saysky/manland)
-
 ## 技术组成
 - SpringBoot
 - MyBatis
@@ -41,3 +41,4 @@
 ## 联系方式
 需要提供部署或讲解服务，可以联系我
 微信：847064370
+

pom.xml

@@ -135,7 +135,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.47</version>
+            <version>1.2.83</version>
         </dependency>
 
         <dependency>
@@ -204,3 +204,6 @@
         </plugins>
     </build>
 </project>
+
+
+

src/main/java/com/example/hotel/entity/Permission.java

@@ -59,4 +59,3 @@ public class Permission  extends BaseEntity {
     @TableField(exist = false)
     private List<Permission> childPermissions;
 
-}

src/main/java/com/example/hotel/entity/Post.java

@@ -74,4 +74,3 @@ public class Post extends BaseEntity {
     @TableField(exist = false)
     private Category category;
 
-}

src/main/java/com/example/hotel/entity/Role.java

@@ -46,4 +46,3 @@ public class Role  extends BaseEntity {
     @TableField(exist = false)
     private List<Permission> permissions;
 
-}

src/main/java/com/example/hotel/entity/RolePermissionRef.java

@@ -25,4 +25,3 @@ public class RolePermissionRef  extends BaseEntity {
         this.roleId = roleId;
         this.permissionId = permissionId;
     }
-}

src/main/java/com/example/hotel/entity/UserRoleRef.java

@@ -31,4 +31,3 @@ public class UserRoleRef  extends BaseEntity {
 
     public UserRoleRef() {
     }
-}

src/main/java/com/example/hotel/util/DateUtil.java

@@ -64,4 +64,3 @@ public class DateUtil {
         System.out.println(getBetweenDates("2020-04-05", 1));
     }
 
-}

src/main/resources/mapper/CategoryMapper.xml

@@ -20,4 +20,3 @@
             AND del_flag = 0
     </select>
 
-</mapper>

src/main/resources/mapper/OrderMapper.xml

@@ -51,4 +51,3 @@
     </select>
 
 
-</mapper>

src/main/resources/mapper/PermissionMapper.xml

@@ -139,4 +139,3 @@
             url = #{url} AND del_flag = 0
         LIMIT 1
     </select>
-</mapper>

src/main/resources/mapper/PostMapper.xml

@@ -61,4 +61,3 @@
         WHERE cate_id = #{value} AND del_flag = 0
     </select>
 
-</mapper>

src/main/resources/mapper/RecordMapper.xml

@@ -47,4 +47,3 @@
     </select>
 
 
-</mapper>

src/main/resources/mapper/RoleMapper.xml

@@ -110,4 +110,3 @@
     </select>
 
 
-</mapper>

src/main/resources/mapper/RolePermissionRefMapper.xml

@@ -33,4 +33,3 @@
     </foreach>
   </insert>
 
-</mapper>

src/main/resources/mapper/UserMapper.xml

@@ -161,4 +161,3 @@
         ORDER BY
             postCount DESC
     </select>
-</mapper>

src/main/resources/mapper/UserRoleRefMapper.xml

@@ -12,4 +12,3 @@
         WHERE user_id = #{value}
             AND del_flag = 0
   </delete>
-</mapper>

src/main/resources/static/css/alt/AdminLTE-select2.min.css

@@ -1 +0,0 @@
-.select2-container--default.select2-container--focus,.select2-selection.select2-container--focus,.select2-container--default:focus,.select2-selection:focus,.select2-container--default:active,.select2-selection:active{outline:none}.select2-container--default .select2-selection--single,.select2-selection .select2-selection--single{border:1px solid #d2d6de;border-radius:0;padding:6px 12px;height:34px}.select2-container--default.select2-container--open{border-color:#3c8dbc}.select2-dropdown{border:1px solid #d2d6de;border-radius:0}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#3c8dbc;color:white}.select2-results__option{padding:6px 12px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{padding-left:0;padding-right:0;height:auto;margin-top:-4px}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:6px;padding-left:20px}.select2-container--default .select2-selection--single .select2-selection__arrow{height:28px;right:3px}.select2-container--default .select2-selection--single .select2-selection__arrow b{margin-top:0}.select2-dropdown .select2-search__field,.select2-search--inline .select2-search__field{border:1px solid #d2d6de}.select2-dropdown .select2-search__field:focus,.select2-search--inline .select2-search__field:focus{outline:none}.select2-container--default.select2-container--focus .select2-selection--multiple,.select2-container--default .select2-search--dropdown .select2-search__field{border-color:#3c8dbc !important}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option[aria-selected=true],.select2-container--default .select2-results__option[aria-selected=true]:hover{color:#444}.select2-container--default .select2-selection--multiple{border:1px solid #d2d6de;border-radius:0}.select2-container--default .select2-selection--multiple:focus{border-color:#3c8dbc}.select2-container--default.select2-container--focus .select2-selection--multiple{border-color:#d2d6de}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#3c8dbc;border-color:#367fa9;padding:1px 10px;color:#fff}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{margin-right:5px;color:rgba(255,255,255,0.7)}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#fff}.select2-container .select2-selection--single .select2-selection__rendered{padding-right:10px}

src/main/resources/static/css/login.min.css

@@ -25,4 +25,3 @@
     float: left;
     font-size: 14px;
     margin-right: 10px;
-}

src/main/resources/static/css/style.css

@@ -201,4 +201,3 @@
 }
 .font-warning {
     color: #8a3a12;
-}

src/main/resources/static/front/css/dashboard.css

@@ -4925,4 +4925,3 @@ a.close-list-item {
 }
 .booking-table .button i{
 	padding: 0;
-}

src/main/resources/static/front/css/default.css

@@ -860,4 +860,3 @@ label.error {
 
 .contact-form .alert-success h3{margin-bottom: 5px; color: #fff; font-size: 21px;}
 
-.alert-success p{color: #fff;}

src/main/resources/static/front/css/style.css

@@ -5527,4 +5527,3 @@ section.events .meta span {
 .night-mode .pagination li a, .night-mode .comment-box input,
 .night-mode .comment-box textarea{background: #000; color: #fff;}
 
-.night-mode section.related-rooms {background: #161616;}

src/main/resources/static/front/font/simple-line-icons.eot

@@ -67,4 +67,3 @@ var themes_object = {"ajax_url":"https:\/\/cyclonethemes.com\/wp-admin\/admin-aj
 	grecaptcha,
 	'6LfKzKUUAAAAALrBaDjEDtTVm81ceoIK4Gajso2z',
 	{"homepage":"homepage","contactform":"contactform"}
-);</script> </body></html>

src/main/resources/static/front/font/simple-line-icons.svg

@@ -67,4 +67,3 @@ var themes_object = {"ajax_url":"https:\/\/cyclonethemes.com\/wp-admin\/admin-aj
 	grecaptcha,
 	'6LfKzKUUAAAAALrBaDjEDtTVm81ceoIK4Gajso2z',
 	{"homepage":"homepage","contactform":"contactform"}
-);</script> </body></html>