Merge branch 'bug_mk' into data-page

# Conflicts:
#	pages/statistics/modules/HotlineRates/HotlineRates.js

pages/statistics/modules/HotlineRates/HotlineRates.js

@@ -88,7 +88,7 @@ Component({
             event12345Rates({
                 startDate: this.data.day.toString() + ' ' + '00:00:00',
                 endDate: this.data.day2.toString()  + ' ' +  '23:59:59',
-                usableFlag: false,
+                usableFlag: true,
                 // deptFlag: deptFlag,
                 recountFlag:1
             }).then(res => {

utils/config.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: mk 2403457699@qq.com
+ * @Date: 2024-10-11 09:22:38
+ * @LastEditors: mk 2403457699@qq.com
+ * @LastEditTime: 2024-10-14 17:48:57
+ * @FilePath: \epmet-work-mp\utils\config.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 module.exports = {
     BASEURL: BASEURL,
     Token: getToken,