Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -311,7 +311,8 @@
         OPERATION_POINT_NAME "OPERATION_POINT_NAME",
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text",
-        OPERATION_POINT_CODE "code"
+        OPERATION_POINT_CODE "code",
+        REMARK "remark"
         from RMS_OPERATION_POINT
         <where>
             DELETED = 0
@@ -332,7 +333,7 @@
             </if>
         </where>
         order by alternate_fields3,LENGTH(OPERATION_POINT_NAME)
-        FETCH NEXT 10 ROWS ONLY
+        FETCH NEXT 50 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
             UNION select
@@ -341,7 +342,8 @@
             OPERATION_POINT_NAME "OPERATION_POINT_NAME",
             OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
             OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text",
-            OPERATION_POINT_CODE "code"
+            OPERATION_POINT_CODE "code",
+            REMARK "remark"
             from RMS_OPERATION_POINT
             where  OPERATION_POINT_ID in
             <foreach collection="id" item="item"  open="(" close=")" separator="," >