 李鹏宇
|
b5d8b33f55
|
!737 zhou
Merge pull request !737 from 李鹏宇/dev_zhou
|
2024-12-12 07:14:51 +00:00 |
|
|
zhouzhou
|
9c833d1637
|
添加功能
|
2024-12-12 15:11:38 +08:00 |
|
|
李鹏宇
|
08078cae49
|
!735 zhou
Merge pull request !735 from 李鹏宇/dev_zhou
|
2024-12-12 06:56:14 +00:00 |
|
|
zhouzhou
|
a980319089
|
添加功能
|
2024-12-12 14:55:30 +08:00 |
|
|
李鹏宇
|
ae4a26e447
|
!734 zhou
Merge pull request !734 from 李鹏宇/dev_zhou
|
2024-12-12 06:28:45 +00:00 |
|
|
zhouzhou
|
21dd72fd62
|
Merge branch 'refs/heads/dev' into dev_zhou
# Conflicts:
# yuthon_hr_attendance/views/go_approval.xml
|
2024-12-12 14:27:28 +08:00 |
|
|
zhouzhou
|
9f0d63876a
|
添加功能
|
2024-12-12 14:24:04 +08:00 |
|
|
李鹏宇
|
4d1a03b614
|
!733 zhou
Merge pull request !733 from 李鹏宇/dev_zhou
|
2024-12-12 01:46:20 +00:00 |
|
|
zhouzhou
|
1e6d6e24ce
|
添加功能
|
2024-12-12 09:44:49 +08:00 |
|
|
李鹏宇
|
66789f839a
|
pengyuthon wechat
|
2024-12-12 07:54:16 +08:00 |
|
|
李鹏宇
|
0c8ece6661
|
pengyuthon wechat
|
2024-12-12 01:20:16 +08:00 |
|
|
ljm
|
30793e1f89
|
!729 1
Merge pull request !729 from dev_ljm_20241129
|
2024-12-11 14:00:03 +00:00 |
|
|
ljmwkx
|
c93e6b3625
|
审批 还原
|
2024-12-11 21:58:53 +08:00 |
|
|
李鹏宇
|
34c29f9614
|
!727 zhou
Merge pull request !727 from 李鹏宇/dev_zhou
|
2024-12-11 12:05:08 +00:00 |
|
|
zhouzhou
|
850fd6fa59
|
添加功能
|
2024-12-11 20:03:44 +08:00 |
|
|
李鹏宇
|
1aee66ad5f
|
pengyuthon wechat
|
2024-12-11 19:58:22 +08:00 |
|
|
李鹏宇
|
b361e4172b
|
!725 zhou
Merge pull request !725 from 李鹏宇/dev_zhou
|
2024-12-11 11:55:52 +00:00 |
|
|
zhouzhou
|
76f72733de
|
添加功能
|
2024-12-11 19:50:24 +08:00 |
|
|
李鹏宇
|
a95ed0b5bf
|
!724 pengyuthon
Merge pull request !724 from 李鹏宇/dev
|
2024-12-11 08:59:47 +00:00 |
|
|
李鹏宇
|
9d42a9e77b
|
pengyuthon wechat
|
2024-12-11 08:59:22 +00:00 |
|
|
李鹏宇
|
65a41997db
|
!723 pengyuthon
Merge pull request !723 from 李鹏宇/dev
|
2024-12-11 08:56:36 +00:00 |
|
|
ljm
|
c770cf5c7f
|
!722 1
Merge pull request !722 from dev_ljm_20241129
|
2024-12-11 07:48:34 +00:00 |
|
|
ljmwkx
|
eca2606dd3
|
物业合同管理 计算 管理费用
|
2024-12-11 15:47:28 +08:00 |
|
|
李鹏宇
|
5b1f57b10f
|
!721 zhou
Merge pull request !721 from 李鹏宇/dev_zhou
|
2024-12-11 06:51:24 +00:00 |
|
|
zhouzhou
|
2ae9ed2883
|
添加功能
|
2024-12-11 14:49:22 +08:00 |
|
|
李鹏宇
|
4d561daffb
|
!720 pengyuthon
Merge pull request !720 from 李鹏宇/dev
|
2024-12-11 06:19:14 +00:00 |
|
|
李鹏宇
|
705cceddf8
|
pengyuthon wechat
|
2024-12-11 14:17:49 +08:00 |
|
|
李鹏宇
|
41d45383eb
|
!719 zhou
Merge pull request !719 from 李鹏宇/dev
|
2024-12-11 04:02:42 +00: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 |
|
|
李鹏宇
|
6bbc5cb78a
|
!717 zhou
Merge pull request !717 from 李鹏宇/dev
|
2024-12-11 03:57:34 +00: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 |
|
|
李鹏宇
|
5767cca7eb
|
!715 pengyuthon
Merge pull request !715 from 李鹏宇/dev
|
2024-12-11 03:22:11 +00:00 |
|
|
李鹏宇
|
5415ffabf4
|
pengyuthon wechat
|
2024-12-11 11:21:17 +08:00 |
|
|
李鹏宇
|
a69c817f4e
|
!714 zhou
Merge pull request !714 from 李鹏宇/dev
|
2024-12-11 02:16:08 +00: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 |
|