 李鹏宇
|
56d210361c
|
!881 zhou
Merge pull request !881 from 李鹏宇/dev
|
2024-12-22 09:06:26 +00:00 |
|
|
李鹏宇
|
ecf50e7dda
|
!880 zhou
Merge pull request !880 from 李鹏宇/dev_zhou
|
2024-12-22 09:05:56 +00:00 |
|
|
李鹏宇
|
2869162be2
|
!879 zhou
Merge pull request !879 from 李鹏宇/dev
|
2024-12-22 08:59:18 +00:00 |
|
|
李鹏宇
|
f00c25a87e
|
!878 zhou
Merge pull request !878 from 李鹏宇/dev_zhou
|
2024-12-22 08:58:32 +00:00 |
|
|
zhouzhou
|
3c2be5d441
|
添加功能
|
2024-12-22 16:57:45 +08:00 |
|
|
李鹏宇
|
c3ae209f90
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhou
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
|
2024-12-22 08:56:37 +00:00 |
|
|
zhouzhou
|
87b2c2b242
|
添加功能
|
2024-12-22 16:54:46 +08:00 |
|
|
ljm
|
fd88c29809
|
!877 1
Merge pull request !877 from dev_ljm_20241129
|
2024-12-22 07:43:49 +00:00 |
|
|
ljmwkx
|
0f9812bf8f
|
考勤 开始结束时间 计算
|
2024-12-22 15:43:20 +08:00 |
|
|
李鹏宇
|
525220ef60
|
!876 zhou
Merge pull request !876 from 李鹏宇/dev
|
2024-12-22 07:38:56 +00:00 |
|
|
李鹏宇
|
22dab66de3
|
!875 zhou
Merge pull request !875 from 李鹏宇/dev_zhou
|
2024-12-22 07:38:33 +00:00 |
|
|
zhouzhou
|
806abfaaf8
|
添加功能
|
2024-12-22 15:36:24 +08:00 |
|
|
ljm
|
225a0a355b
|
!874 1
Merge pull request !874 from dev_ljm_20241129
|
2024-12-22 06:45:42 +00:00 |
|
|
ljmwkx
|
bf7ea77e44
|
物业 开始结束时间 计算
|
2024-12-22 14:44:04 +08:00 |
|
|
李鹏宇
|
262e950b97
|
!873 zhou
Merge pull request !873 from 李鹏宇/dev
|
2024-12-21 13:13:59 +00:00 |
|
|
李鹏宇
|
cf174943ba
|
!872 zhou
Merge pull request !872 from 李鹏宇/dev_zhou
|
2024-12-21 13:13:34 +00:00 |
|
|
zhouzhou
|
6ed3d2d245
|
添加功能
|
2024-12-21 21:11:28 +08:00 |
|
|
zhouzhou
|
3c9c11d55d
|
添加功能
|
2024-12-21 21:07:41 +08:00 |
|
|
zhouzhou
|
b5893d4a59
|
添加功能
|
2024-12-21 21:05:23 +08:00 |
|
|
李鹏宇
|
586461cf88
|
!871 pengyuthon
Merge pull request !871 from 李鹏宇/dev
|
2024-12-21 02:21:45 +00:00 |
|
|
李鹏宇
|
4679db2d18
|
pengyuthon wechat
|
2024-12-21 10:20:22 +08:00 |
|
|
李鹏宇
|
70d4d84226
|
!870 zhou
Merge pull request !870 from 李鹏宇/dev
|
2024-12-20 13:12:35 +00:00 |
|
|
李鹏宇
|
42a487cc0a
|
!869 zhou
Merge pull request !869 from 李鹏宇/dev_zhou
|
2024-12-20 13:12:09 +00:00 |
|
|
李鹏宇
|
2d78ab2998
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhou
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
|
2024-12-20 13:11:58 +00:00 |
|
|
zhouzhou
|
48cc2bb226
|
添加功能
|
2024-12-20 21:08:11 +08:00 |
|
|
ljm
|
558fc41be6
|
!868 流程 增加 经办人
Merge pull request !868 from dev_ljm_20241129
|
2024-12-20 11:07:02 +00:00 |
|
|
ljmwkx
|
5d5d9de802
|
流程 增加 经办人
|
2024-12-20 19:06:35 +08:00 |
|
|
ljm
|
ade1f88760
|
!867 1
Merge pull request !867 from dev_ljm_20241129
|
2024-12-20 10:53:38 +00:00 |
|
|
ljmwkx
|
c227185dfa
|
物业 开始结束时间 计算
|
2024-12-20 18:53:07 +08:00 |
|
|
李鹏宇
|
fa84cc9fb6
|
!866 zhou
Merge pull request !866 from 李鹏宇/dev_zhou
|
2024-12-20 10:51:48 +00:00 |
|
|
zhouzhou
|
da48c29374
|
添加功能
|
2024-12-20 18:50:32 +08:00 |
|
|
zhouzhou
|
c8798d8db8
|
添加功能
|
2024-12-20 18:47:00 +08:00 |
|
|
李鹏宇
|
648c0c2a82
|
!865 zhou
Merge pull request !865 from 李鹏宇/dev_zhou
|
2024-12-20 10:20:36 +00:00 |
|
|
zhouzhou
|
c153b2ec3f
|
添加功能
|
2024-12-20 18:19:54 +08:00 |
|
|
李鹏宇
|
9be1c89e00
|
!864 zhou
Merge pull request !864 from 李鹏宇/dev_zhou
|
2024-12-20 10:08:38 +00:00 |
|
|
zhouzhou
|
82feb92273
|
添加功能
|
2024-12-20 18:07:02 +08:00 |
|
|
李鹏宇
|
e1367cbff0
|
!863 zhou
Merge pull request !863 from 李鹏宇/dev_zhou
|
2024-12-20 09:19:55 +00:00 |
|
|
zhouzhou
|
96b8ced6ef
|
添加功能
|
2024-12-20 17:18:18 +08:00 |
|
|
ljm
|
deeb28de5e
|
!862 增加免租期 和单价计算
Merge pull request !862 from dev_ljm_20241129
|
2024-12-20 05:46:54 +00:00 |
|
|
ljmwkx
|
6e06f490a4
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_ljm_20241129
# Conflicts:
# yuthon_property_approval/models/property_lease_contract.py
# yuthon_property_approval/views/property_lease_contract.xml
|
2024-12-20 13:43:03 +08:00 |
|
|
ljmwkx
|
e48deb153b
|
物业 开始结束时间 计算
|
2024-12-20 13:36:00 +08:00 |
|
|
ljmwkx
|
13da0a5b08
|
物业 计算逻辑增加免租期 计算
|
2024-12-20 12:50:47 +08:00 |
|
|
李鹏宇
|
7842a213f2
|
!861 zhou
Merge pull request !861 from 李鹏宇/dev_zhou
|
2024-12-20 03:29:59 +00:00 |
|
|
zhouzhou
|
dc1720a988
|
添加功能
|
2024-12-20 11:28:57 +08:00 |
|
|
李鹏宇
|
189e5a61f4
|
!860 zhou
Merge pull request !860 from 李鹏宇/dev
|
2024-12-20 03:11:52 +00:00 |
|
|
李鹏宇
|
c32e5e1744
|
!859 zhou
Merge pull request !859 from 李鹏宇/dev_zhou
|
2024-12-20 03:10:09 +00:00 |
|
|
zhouzhou
|
f795e2db27
|
添加功能
|
2024-12-20 11:07:53 +08:00 |
|
|
zhouzhou
|
729f178bd7
|
添加功能
|
2024-12-20 11:02:27 +08:00 |
|
|
李鹏宇
|
cdf0e89ca9
|
!858 zhou
Merge pull request !858 from 李鹏宇/dev
|
2024-12-20 02:35:50 +00:00 |
|
|
李鹏宇
|
282be57628
|
!857 zhou
Merge pull request !857 from 李鹏宇/dev_zhou
|
2024-12-20 02:35:12 +00:00 |
|