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

backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx

@@ -1595,6 +1595,20 @@
 						</m:function-definition>
 						<m:icon>iconfont iconqiyeshezhi1x</m:icon>
 					</m:function-node>
+					<m:function-node>
+						<m:id>47f27d7f-eeb1-4485-87fc-e00ecfdf9995</m:id>
+						<m:name>billManage</m:name>
+						<m:title>报表设置</m:title>
+						<m:index>9000</m:index>
+						<m:license></m:license>
+						<m:privilege></m:privilege>
+						<m:role>bizManagerRole</m:role>
+						<m:function-definition>
+							<m:view>function-bill-manage</m:view>
+							<m:view-config></m:view-config>
+						</m:function-definition>
+						<m:icon>iconfont iconhetongzhihangfenxi1x</m:icon>
+					</m:function-node>
                     <m:function-node>
 						<m:id>1f075780-2cf0-4d7d-a3af-c0bd5fc813ae</m:id>
 						<m:name>logMgr</m:name>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/RetailInfoWarningExe.jmx

@@ -80,8 +80,8 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>memo</m:name>
-					<m:title>备注</m:title>
+					<m:name>message</m:name>
+					<m:title>预警消息</m:title>
 					<m:type>string</m:type>
 					<m:ref>
 						<m:name></m:name>
@@ -90,8 +90,8 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>max</m:name>
-					<m:title>预警值</m:title>
+					<m:name>memo</m:name>
+					<m:title>备注</m:title>
 					<m:type>string</m:type>
 					<m:ref>
 						<m:name></m:name>
@@ -100,8 +100,8 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>actualValue</m:name>
-					<m:title>实际值</m:title>
+					<m:name>max</m:name>
+					<m:title>预警值</m:title>
 					<m:type>string</m:type>
 					<m:ref>
 						<m:name></m:name>
@@ -110,8 +110,8 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>message</m:name>
-					<m:title>预警消息</m:title>
+					<m:name>actualValue</m:name>
+					<m:title>实际值</m:title>
 					<m:type>string</m:type>
 					<m:ref>
 						<m:name></m:name>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/StationInfoApply.jmx

@@ -58,6 +58,36 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
+					<m:name>stationCoordinate</m:name>
+					<m:title>场站坐标</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>linkMan</m:name>
+					<m:title>联系人</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>telephone</m:name>
+					<m:title>联系电话</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
 					<m:name>stationAddress</m:name>
 					<m:title>场站地址</m:title>
 					<m:type>string</m:type>
@@ -157,7 +187,6 @@
 					</m:ref>
 					<m:desc></m:desc>
 				</m:field>
-
 				<m:field>
 					<m:name>del</m:name>
 					<m:title>是否删除</m:title>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesRecordStatisticsAdvQuery.jmx

@@ -24,6 +24,8 @@
 				WHERE 1=1
 				AND salesRecord.syncTime >= :?startDate 
 				AND salesRecord.syncTime <= :?endDate 
+				ORDER BY salesRecord.syncTime
+				LIMIT :?limitNum
 			</sql>
 		</template>
 	</content>