Commit ee670fd5 by 吕明尚

Merge branch 'dev' into test

parents 791005f6 439f31c2
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<sql id="selectSRoomVo"> <sql id="selectSRoomVo">
select id, select id,
store_id, store_id,
sort,
name, name,
room_type, room_type,
images, images,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment