 zhouzhou
|
76f72733de
|
添加功能
|
2024-12-11 19:50:24 +08:00 |
|
|
zhouzhou
|
2ae9ed2883
|
添加功能
|
2024-12-11 14:49:22 +08:00 |
|
|
李鹏宇
|
705cceddf8
|
pengyuthon wechat
|
2024-12-11 14:17:49 +08:00 |
|
|
李鹏宇
|
e45e4f7deb
|
!718 zhou
Merge pull request !718 from 李鹏宇/dev_zhou
|
2024-12-11 04:02:20 +00:00 |
|
|
zhouzhou
|
8fb28fbd3b
|
添加功能
|
2024-12-11 12:01:32 +08:00 |
|
|
李鹏宇
|
c4a96fd38d
|
pengyuthon wechat
|
2024-12-11 11:56:29 +08:00 |
|
|
李鹏宇
|
2a093fb36f
|
!716 zhou
Merge pull request !716 from 李鹏宇/dev_zhou
|
2024-12-11 03:55:50 +00:00 |
|
|
zhouzhou
|
22c117cb0f
|
Merge branch 'refs/heads/dev' into dev_zhou
# Conflicts:
# yuthon_hr_attendance/views/yuthon_run_planning_views.xml
|
2024-12-11 11:55:11 +08:00 |
|
|
zhouzhou
|
8e95d2a0eb
|
添加功能
|
2024-12-11 11:52:27 +08:00 |
|
|
李鹏宇
|
5415ffabf4
|
pengyuthon wechat
|
2024-12-11 11:21:17 +08:00 |
|
|
李鹏宇
|
142687663a
|
!713 zhou
Merge pull request !713 from 李鹏宇/dev_zhou
|
2024-12-11 02:15:28 +00:00 |
|
|
zhouzhou
|
fc72baaee7
|
添加功能
|
2024-12-11 10:13:13 +08:00 |
|
|
李鹏宇
|
5c1cc21fce
|
!712 pengyuthon
Merge pull request !712 from 李鹏宇/dev
|
2024-12-10 13:30:51 +00:00 |
|
|
李鹏宇
|
50da1a15dc
|
pengyuthon wechat
|
2024-12-10 21:26:36 +08:00 |
|
|
李鹏宇
|
6e41e737df
|
!711 pengyuthon
Merge pull request !711 from 李鹏宇/dev
|
2024-12-10 13:15:10 +00:00 |
|
|
ljm
|
aa0b41bfd8
|
!710 1
Merge pull request !710 from dev_ljm_20241129
|
2024-12-10 13:09:16 +00:00 |
|
|
ljmwkx
|
434cd1565d
|
物业合同管理 计算
|
2024-12-10 21:05:27 +08:00 |
|
|
李鹏宇
|
656de39319
|
pengyuthon wechat
|
2024-12-10 21:03:08 +08:00 |
|
|
ljmwkx
|
1c541efe7e
|
物业合同管理 计算
|
2024-12-10 21:02:55 +08:00 |
|
|
ljm
|
5baecac2fb
|
!709 计算逻辑需要不断增加考虑情况
Merge pull request !709 from dev_ljm_20241129
|
2024-12-10 06:28:04 +00:00 |
|
|
ljmwkx
|
b05ff3a6df
|
物业合同管理 计算
|
2024-12-10 14:27:24 +08:00 |
|
|
ljmwkx
|
964eecee54
|
物业合同管理 计算
|
2024-12-10 14:24:09 +08:00 |
|
|
ljmwkx
|
7e116cd7ab
|
物业合同管理 计算
|
2024-12-10 12:20:11 +08:00 |
|
|
李鹏宇
|
5d07b2004d
|
!708 pengyuthon
Merge pull request !708 from 李鹏宇/dev
|
2024-12-10 03:14:41 +00:00 |
|
|
李鹏宇
|
cb782a1ee3
|
pengyuthon wechat
|
2024-12-10 11:12:40 +08:00 |
|
|
李鹏宇
|
5448c71453
|
!707 zhou
Merge pull request !707 from 李鹏宇/dev
|
2024-12-09 13:17:56 +00:00 |
|
|
李鹏宇
|
e81ead9920
|
!706 zhou
Merge pull request !706 from 李鹏宇/dev_zhou
|
2024-12-09 13:17:29 +00:00 |
|
|
zhouzhou
|
9c2ee0c301
|
添加功能
|
2024-12-09 21:15:36 +08:00 |
|
|
李鹏宇
|
3c7a9aba46
|
!705 zhou
Merge pull request !705 from 李鹏宇/dev
|
2024-12-09 13:12:28 +00:00 |
|
|
李鹏宇
|
804b9f2fc6
|
!704 zhou
Merge pull request !704 from 李鹏宇/dev_zhou
|
2024-12-09 13:11:46 +00:00 |
|
|
zhouzhou
|
e525e6d593
|
添加功能
|
2024-12-09 21:08:53 +08:00 |
|
|
李鹏宇
|
b93bf06d80
|
!703 zhou
Merge pull request !703 from 李鹏宇/dev
|
2024-12-09 12:43:43 +00:00 |
|
|
李鹏宇
|
66e07c1ab4
|
!702 zhou
Merge pull request !702 from 李鹏宇/dev_zhou
|
2024-12-09 12:43:10 +00:00 |
|
|
zhouzhou
|
d99b766240
|
添加功能
|
2024-12-09 20:41:11 +08:00 |
|
|
ljmwkx
|
78606aa208
|
物业合同管理 调整
|
2024-12-09 19:38:25 +08:00 |
|
|
李鹏宇
|
f9ae47e5ac
|
!701 pengyuthon
Merge pull request !701 from 李鹏宇/dev
|
2024-12-09 09:33:48 +00:00 |
|
|
李鹏宇
|
8ea4e6b76d
|
pengyuthon wechat
|
2024-12-09 17:31:36 +08:00 |
|
|
李鹏宇
|
627d3b95f0
|
!700 zhou
Merge pull request !700 from 李鹏宇/dev
|
2024-12-09 09:20:05 +00:00 |
|
|
李鹏宇
|
6942405b19
|
!699 zhou
Merge pull request !699 from 李鹏宇/dev_zhou
|
2024-12-09 09:19:25 +00:00 |
|
|
zhouzhou
|
388736d31a
|
添加功能
|
2024-12-09 17:16:44 +08:00 |
|
|
李鹏宇
|
e5ca589144
|
!698 zhou
Merge pull request !698 from 李鹏宇/dev_zhou
|
2024-12-09 07:07:25 +00:00 |
|
|
zhouzhou
|
87f8b5abda
|
添加功能
|
2024-12-09 15:05:52 +08:00 |
|
|
李鹏宇
|
3109bf1b9e
|
!697 pengyuthon
Merge pull request !697 from 李鹏宇/dev
|
2024-12-09 03:39:33 +00:00 |
|
|
李鹏宇
|
fde1f9c807
|
pengyuthon wechat
|
2024-12-09 11:39:00 +08:00 |
|
|
李鹏宇
|
2effe17891
|
!696 1
Merge pull request !696 from 李鹏宇/dev
|
2024-12-09 02:59:38 +00:00 |
|
|
李鹏宇
|
d943931a28
|
pengyuthon wechat
|
2024-12-09 10:58:33 +08:00 |
|
|
李鹏宇
|
aafbe800c7
|
!695 zhou
Merge pull request !695 from 李鹏宇/dev
|
2024-12-09 02:03:07 +00:00 |
|
|
李鹏宇
|
d1ec2f4d3d
|
!694 zhou
Merge pull request !694 from 李鹏宇/dev_zhou
|
2024-12-09 02:02:40 +00:00 |
|
|
zhouzhou
|
2aa2c76ac2
|
添加功能
|
2024-12-09 10:00:49 +08:00 |
|
|
李鹏宇
|
63d88cd206
|
!693 1
Merge pull request !693 from 李鹏宇/dev
|
2024-12-08 13:49:18 +00:00 |
|