Merge branch 'master' of http://192.168.200.25:3000/Lenheart/MXD-Server

src/gui/UI_LenheartUI/ItemRecovery.java

@@ -83,7 +83,7 @@ public class ItemRecovery extends JPanel {
                 new Object[][] {
                 },
                 new String[] {
-                    "\u7269\u54c1\u5151\u6362\u6570\u91cf", "\u7269\u54c1\u5151\u6362\u4ee3\u7801", "\u6240\u9700\u7269\u54c1\u4ee3\u7801", "\u6240\u9700\u7269\u54c1\u6570\u91cf"
+                    "\u6240\u9700\u7269\u54c1\u4ee3\u7801", "\u7269\u54c1\u5151\u6362\u6570\u91cf", "\u7269\u54c1\u5151\u6362\u4ee3\u7801", "\u6240\u9700\u7269\u54c1\u6570\u91cf"
                 }
             ) {
                 Class<?>[] columnTypes = new Class<?>[] {

src/gui/UI_LenheartUI/ItemRecovery.jfd

@@ -12,9 +12,9 @@ new FormModel {
 				add( new FormComponent( "javax.swing.JTable" ) {
 					name: "ItemTable"
 					"model": new com.jformdesigner.model.SwingTableModel( new java.util.Vector, new java.util.Vector {
+						add( "所需物品代码" )
 						add( "物品兑换数量" )
 						add( "物品兑换代码" )
-						add( "所需物品代码" )
 						add( "所需物品数量" )
 					}, new java.util.Vector {
 						add( class java.lang.Integer )