Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.biz/src/main/resources/config/DinasType.hbm.xml

@@ -67,7 +67,7 @@
             </column>
         </property>
 
-        <property name="sortOrder" type="int" not-null="true"  unique="true" update="false" insert="false" index="dinas_sort_index" >
+        <property name="sortOrder" type="int" not-null="false"  unique="false"  >
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>

backend/xyst.dinas.biz/src/main/resources/config/SandMiningArea.hbm.xml

@@ -87,7 +87,7 @@
                 <comment>不通过原因</comment>
             </column>
         </property>
-        <property name="sortOrder" type="int" not-null="true"  unique="true" index="sand_mining_area_sort_index" >
+        <property name="sortOrder" type="int" not-null="false">
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>

backend/xyst.dinas.biz/src/main/resources/config/ShipInfo.hbm.xml

@@ -80,7 +80,7 @@
                 <comment>备注</comment>
             </column>
         </property>
-        <property name="sortOrder" type="int" not-null="true"  unique="true" index="station_sort_index" >
+        <property name="sortOrder" type="int" not-null="false"  unique="false"  >
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>

backend/xyst.dinas.biz/src/main/resources/config/Station.hbm.xml

@@ -85,7 +85,7 @@
                 <comment>备注</comment>
             </column>
         </property>
-        <property name="sortOrder" type="int" not-null="true"  unique="true" index="station_sort_index" >
+        <property name="sortOrder" type="int" not-null="false" >
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>

backend/xyst.dinas.camera/src/main/resources/config/CameraInfo.hbm.xml

@@ -154,7 +154,7 @@
             </column>
         </property>
 
-        <property name="sortOrder" type="int" not-null="true"  unique="true" update="false" insert="false" index="camera_sort_index" >
+        <property name="sortOrder" type="int" not-null="true"  unique="true" >
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>