Commit Graph
100 Commits
Author SHA1 Message Date
sunjie a963305939 Remove tracked pyc files and ignore them 2025-11-04 14:45:09 +08:00
sunjie c9b831ce6a 修改日期 2025-11-04 14:43:11 +08:00
sunjie e71e42e54e 修改日期 2025-11-04 14:41:28 +08:00
sunjie 9186b31081 修改日期 2025-11-04 14:33:35 +08:00
sunjie 777061bac8 修改日期 2025-11-04 02:25:30 +08:00
sunjie 11d10d2e23 修改日期 2025-10-27 23:27:38 +08:00
sunjie 5f6bb6facc 修改日期 2025-10-27 23:22:11 +08:00
sunjie b9be25ba0b 修改日期 2025-10-27 23:16:21 +08:00
sunjie b343f5bff3 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-27 23:08:09 +08:00
sunjie 13742038d1 修改日期 2025-10-27 23:08:00 +08:00
sunjie 1aff35b10d 修改日期 2025-10-27 00:58:14 +08:00
sunjie 1251da1abb 修改日期 2025-10-23 16:42:40 +08:00
sunjie 8118f7148a Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-23 15:52:48 +08:00
sunjie 673c25a91c 修改日期 2025-10-23 15:52:38 +08:00
sunjie e124ffd98d Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-21 23:20:45 +08:00
sunjie dea942c7ff 遮挡修改 2025-10-21 23:20:38 +08:00
sunjie 852fd48b92 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-21 15:28:35 +08:00
sunjie 75d25c0315 遮挡修改 2025-10-21 15:28:24 +08:00
sunjie ca7260d22a Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-21 10:36:20 +08:00
sunjie 84fa0bc3cf 遮挡修改 2025-10-21 10:33:09 +08:00
sunjie 19ab90ea06 遮挡修改 2025-10-21 10:32:23 +08:00
sunjie c89c887bc1 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-21 10:21:19 +08:00
sunjie 971568575a 遮挡修改 2025-10-14 17:03:05 +08:00
sunjie 46e6035482 遮挡修改 2025-10-13 23:06:45 +08:00
sunjie 849423a2c5 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-13 22:21:31 +08:00
sunjie ee3cde84c7 遮挡修改 2025-10-13 22:21:17 +08:00
sunjie a504f0b192 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-13 15:34:29 +08:00
sunjie b3402920e6 修改报表日期 2025-10-13 01:57:39 +08:00
sunjie 3bf63cdafd Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-13 01:39:26 +08:00
sunjie 243a730b4d 调整完打印 2025-10-13 01:39:11 +08:00
sunjie d326841910 1. 更新报表查询条件. 2025-10-10 23:59:58 +08:00
sunjie 0d625b5eeb Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-10 09:45:10 +08:00
sunjie 63bfeceb88 Merge branch 'dev2' into dev 2025-10-10 09:45:03 +08:00
sunjie 27a94f741c 调整接口 2025-10-10 09:44:14 +08:00
sunjie 38649d18c2 调整接口 2025-10-10 00:54:16 +08:00
sunjie 8e7c00f6e0 调整接口 2025-10-08 23:41:46 +08:00
sunjie 0b97740d24 调整接口 2025-10-08 22:57:36 +08:00
sunjie 7f938036b0 调整接口 2025-10-08 22:46:10 +08:00
sunjie e8b4743276 Merge branch 'dev2' of gitee.com:jinan-pengyusen-data/gzth into dev2 2025-10-08 21:43:30 +08:00
sunjie 0965c92fc4 调整接口 2025-10-06 01:01:19 +08:00
sunjie c5b141dd24 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-05 00:12:04 +08:00
sunjie 8cef0937cc Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-10-03 00:01:36 +08:00
sunjie cc3061dfed 调整接口 2025-10-03 00:01:27 +08:00
sunjie ccd834f4e5 调整接口 2025-09-29 16:24:30 +08:00
sunjie d3d72e59c7 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-09-29 16:15:54 +08:00
sunjie b51ec8110a 调整接口 2025-09-29 16:15:43 +08:00
sunjie 864649fafa Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-09-29 00:21:08 +08:00
sunjie 82cdf13ade 调整接口 2025-09-29 00:20:53 +08:00
sunjie 7a015e8727 调整接口 2025-09-26 23:23:50 +08:00
sunjie 8098621bdd 改表位置 2025-09-26 00:26:28 +08:00
sunjie fe6bf85c89 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-09-26 00:06:56 +08:00
sunjie 4b6ae33c8c 改表位置 2025-09-26 00:06:44 +08:00
sunjie de6dfcf355 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-09-24 22:00:34 +08:00
sunjie 7dd5b3bca7 汉化 2025-09-24 22:00:18 +08:00
sunjie e102022021 更新读表数据 2025-09-24 21:50:22 +08:00
sunjie 57b0ac6193 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-09-23 10:54:04 +08:00
sunjie ad3540bcdb 更新读表数据 2025-09-23 10:53:59 +08:00
sunjie 2b27ad3511 更新读表数据 2025-09-23 02:03:47 +08:00
sunjie 0662e90a6a 更新读表数据 2025-09-22 23:10:19 +08:00
sunjie 2b51d5a751 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
# Conflicts:
#	yuthon_property/models/property_meter_archives.py
2025-09-22 22:58:19 +08:00
sunjie 8df445fe83 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-09-22 02:23:06 +08:00
sunjie 3dcd1c7cd7 修改badge 2025-09-22 02:22:44 +08:00
sunjie 0ec0ae10b2 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-09-18 16:34:09 +08:00
sunjie f4de14df0e 修改badge 2025-09-18 16:27:02 +08:00
sunjie 1cc1b12cf1 修改badge 2025-09-09 23:33:44 +08:00
sunjie 4b3ddf3ad0 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-09-08 15:09:09 +08:00
sunjie 55c0092f4c 修改badge 2025-09-08 01:16:40 +08:00
sunjie a3ec20bf2b 修改badge 2025-09-02 22:41:05 +08:00
sunjie eb053e546e Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-09-02 21:55:21 +08:00
sunjie 45463bc28f 修改badge 2025-09-02 21:55:12 +08:00
sunjie f4bc88e533 增加更新脚本 2025-09-01 23:39:39 +08:00
sunjie cbad58aab4 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-29 02:01:46 +08:00
sunjie 378dd719bd 增加更新脚本 2025-08-29 02:01:36 +08:00
sunjie 6889352f21 增加更新脚本 2025-08-25 01:10:29 +08:00
sunjie f3a0f26af5 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-22 02:52:55 +08:00
sunjie f77c71c091 增加更新脚本 2025-08-22 02:52:45 +08:00
sunjie f7c767ab83 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-21 15:03:07 +08:00
sunjie f54e99054b 增加更新脚本 2025-08-21 14:52:43 +08:00
sunjie 99a4639db8 更新 2025-08-19 16:10:17 +08:00
sunjie 772fc8519b Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-19 16:07:52 +08:00
sunjie 58753dfcb9 增加更新脚本 2025-08-19 16:01:30 +08:00
sunjie 9c8f33c93a Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-17 23:56:05 +08:00
sunjie 6cdbb6e81a 增加更新脚本 2025-08-17 23:52:31 +08:00
sunjie be4b645b77 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-15 16:05:22 +08:00
sunjie a727cd956e 增加更新脚本 2025-08-15 16:05:12 +08:00
sunjie ae8936e123 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-15 12:16:51 +08:00
sunjie 95009df779 增加更新脚本 2025-08-15 12:16:34 +08:00
sunjie 137afd53c0 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-15 11:26:58 +08:00
sunjie 4f580a3b9d 更新一下 property_meter_water_views 视图 2025-08-15 11:26:49 +08:00
sunjie 99e1e176d9 更新一下 property_meter_water_views 视图 2025-08-15 01:52:12 +08:00
sunjie 2736cae62f 更新一下 property_meter_water_views 视图 2025-08-14 20:43:40 +08:00
sunjie d65deeda9c Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
# Conflicts:
#	yuthon_hr_attendance/models/hr_attendance_detail_wechat.py
2025-08-13 21:07:08 +08:00
sunjie af743890b0 更新一下 property_meter_water_views 视图 2025-08-13 21:05:20 +08:00
sunjie 21efafbd02 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-10 00:20:46 +08:00
sunjie cf9aad6a08 更新一下 property_meter_water_views 视图 2025-08-10 00:20:35 +08:00
sunjie a339aae907 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-08 22:18:25 +08:00
sunjie 4afb612f95 更新一下 property_meter_water_views 视图 2025-08-08 22:18:15 +08:00
sunjie 3f12bb94ef Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-08-08 01:01:57 +08:00
sunjie cb366e44aa 1. 更新水表,电表数据
2. 显示当前抄表记录
2025-08-08 01:01:39 +08:00
sunjie 37645b1c4c 微信小程序 登录后 获取手机号的功能. 2025-08-07 14:55:43 +08:00