Merge branch '6-resolve-show-lock-status-of-items-in-room-and-guild' into main/yubo-dev

common/database.xml

@@ -704,6 +704,8 @@
               type="I6" />
         <leaf name="PREREQUISIT_VALID"
               type="I1" />
+        <leaf name="RESALE_FLAG"
+              type="I2" />
       </branch>
     </branch>
     <leaf name="MONEY"
@@ -1192,6 +1194,8 @@
               type="I6" />
         <leaf name="PREREQUISIT_VALID"
               type="I1" />
+        <leaf name="RESALE_FLAG"
+              type="I2" />
       </branch>
     </branch>
     <branch name="OUTPOST">