 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 |
|
|
sunjie
|
c7844410af
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-08-07 08:26:38 +08:00 |
|
|
sunjie
|
466087ac12
|
1. 更新物业接口
|
2025-08-07 08:26:27 +08:00 |
|
|
sunjie
|
2367f8b1ad
|
1. 增加文件的忽略.
|
2025-08-06 11:13:56 +08:00 |
|
|
sunjie
|
2c5feec3fb
|
1. 增加文件的忽略.
|
2025-08-06 11:09:06 +08:00 |
|
|
sunjie
|
288d78f41f
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-08-06 10:34:38 +08:00 |
|
|
sunjie
|
a28216ba9a
|
Remove .DS_Store from repository
|
2025-08-06 10:34:17 +08:00 |
|
|
sunjie
|
0246b26484
|
1. 修改承租方的接口
|
2025-08-06 10:31:21 +08:00 |
|
|
sunjie
|
a84b6009a3
|
1. 修改设备维护模版
|
2025-08-06 10:30:00 +08:00 |
|
|
sunjie
|
e75a3ed783
|
1. 修改设备维护模版
|
2025-08-06 09:10:05 +08:00 |
|
|
sunjie
|
eafd9ede1c
|
1. 修改设备维护模版
|
2025-08-06 08:34:47 +08:00 |
|
|
sunjie
|
d8dce211f0
|
1. 修改设备维护模版
|
2025-08-05 23:18:12 +08:00 |
|
|
sunjie
|
46dcfe079a
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-08-05 21:29:40 +08:00 |
|
|
sunjie
|
1bae69d371
|
1. 修改设备维护模版
|
2025-08-05 21:29:30 +08:00 |
|
|
sunjie
|
08fd2dce2d
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-08-05 15:57:58 +08:00 |
|
|
sunjie
|
8fdca4fabf
|
1. 修改设备维护模版
|
2025-08-05 15:57:46 +08:00 |
|
|
sunjie
|
3aff5eb6d9
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-08-05 11:12:24 +08:00 |
|
|
sunjie
|
1cbbe7bc54
|
1. 修改 ace 错位
|
2025-08-05 11:12:03 +08:00 |
|
|
sunjie
|
42d43de220
|
1. 整理 只处理 oo_list_manager 在视图中增加字段,不显示问题.
2. 调整方案: 如果字段名和 视图的字段名不一致,则重置已经通过oo_list_manger 设置的方案.
原因: oo_l 模块 设置保存了方案, 不会再通过 视图去取字段.
|
2025-08-04 00:37:44 +08:00 |
|
|
sunjie
|
7c0b3383e3
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-08-01 14:15:06 +08:00 |
|
|
sunjie
|
5763ea58bd
|
处理 js reduce 初始值问题
|
2025-08-01 14:14:54 +08:00 |
|
|
sunjie
|
5ef1eace9d
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-31 23:46:56 +08:00 |
|
|
sunjie
|
33032fd8b6
|
1. 微信小程序提交的wifi mac(bssid)参数
|
2025-07-31 23:46:36 +08:00 |
|
|
sunjie
|
857b2b3877
|
1. 优化js报错
|
2025-07-31 16:16:25 +08:00 |
|
|
sunjie
|
89ad62f91d
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-31 15:54:29 +08:00 |
|
|
sunjie
|
9f6cb0fa0c
|
1. 由于视图已经使用了 js_class,无法重复使用(重复使用会导致序号覆盖)
2. 通过在 tree 视图添加 class形式进行了特殊判断.
|
2025-07-31 15:54:17 +08:00 |
|
|
sunjie
|
fed2776155
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-29 23:05:01 +08:00 |
|
|
sunjie
|
a7250135d8
|
忽略 **/.DS_Store
|
2025-07-28 11:27:59 +08:00 |
|
|
sunjie
|
10f566e00f
|
去掉模板
|
2025-07-27 19:36:32 +08:00 |
|
|
sunjie
|
46e79114fa
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-27 19:29:38 +08:00 |
|
|
sunjie
|
d1b95cec8d
|
去掉模板
|
2025-07-27 19:29:17 +08:00 |
|
|
sunjie
|
150b1b21a7
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-27 17:40:10 +08:00 |
|
|
sunjie
|
d0908958d4
|
去掉模板
|
2025-07-27 17:39:55 +08:00 |
|
|
sunjie
|
7b7db016db
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
# Conflicts:
# yuthon_maintain/wizard/__init__.py
|
2025-07-27 17:33:35 +08:00 |
|
|
sunjie
|
b2de5861dc
|
去掉模板
|
2025-07-27 17:32:57 +08:00 |
|
|
sunjie
|
e3244a3d16
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-27 17:12:51 +08:00 |
|
|
sunjie
|
a33132f703
|
标签打印功能.完善
|
2025-07-27 17:12:29 +08:00 |
|
|
sunjie
|
d0038b0b1c
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-25 09:27:03 +08:00 |
|
|
sunjie
|
823fc37fef
|
优化图像
|
2025-07-25 09:26:52 +08:00 |
|
|
sunjie
|
e6c43fa947
|
优化图像
|
2025-07-25 08:54:00 +08:00 |
|
|
sunjie
|
511437850f
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-25 08:50:14 +08:00 |
|
|
sunjie
|
51125e492d
|
优化图像
|
2025-07-25 08:49:59 +08:00 |
|
|
sunjie
|
e7f9437b24
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-24 22:37:16 +08:00 |
|
|
sunjie
|
5ca01dd0d5
|
优化图像
|
2025-07-24 22:21:13 +08:00 |
|
|
sunjie
|
69efc924ba
|
1. 增加批量初始化设备功能
|
2025-07-24 16:37:35 +08:00 |
|
|
sunjie
|
fa187dbd2e
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
# Conflicts:
# attendance_iot/views/attendance_iot_user_views.xml
|
2025-07-24 16:05:22 +08:00 |
|
|
sunjie
|
3a39e510dc
|
1. 增加 iot.user 的唯一性.
2. 增加批量拷贝功能
|
2025-07-24 16:04:36 +08:00 |
|
|
sunjie
|
ecd6fae618
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-23 21:40:18 +08:00 |
|
|
sunjie
|
1a3195dc8c
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:40:05 +08:00 |
|
|
sunjie
|
c2f94f24c0
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
|
2025-07-23 21:37:09 +08:00 |
|
|
sunjie
|
9622cf81f5
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:36:52 +08:00 |
|
|
sunjie
|
b5929443dc
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:25:14 +08:00 |
|
|
sunjie
|
ee76aa5f3e
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:20:22 +08:00 |
|
|
sunjie
|
319bf2eab7
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:16:48 +08:00 |
|
|
sunjie
|
4acc85684f
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:12:48 +08:00 |
|
|
sunjie
|
da32680603
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:09:05 +08:00 |
|
|
sunjie
|
36f4a18bdd
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 21:07:27 +08:00 |
|
|
sunjie
|
89619c9140
|
1. 优化从设备同步到服务端的信息,不要再同步回设备
|
2025-07-23 20:24:42 +08:00 |
|