 zhou
|
62cd99c8df
|
Merge branch 'dev' into dev_zhou
# Conflicts:
# yuthon_property_approval/views/property_lease_contract.xml
|
2025-01-06 11:21:58 +08:00 |
|
|
zhou
|
bb8ac8769a
|
添加功能
|
2025-01-06 11:12:34 +08:00 |
|
|
ljm
|
0ef128ebb8
|
!1135 1
Merge pull request !1135 from dev_ljm_20241129
|
2025-01-05 13:45:19 +00:00 |
|
|
ljmwkx
|
5a9fb6d923
|
1
|
2025-01-05 21:44:42 +08:00 |
|
|
ljm
|
b1101f9bb7
|
!1134 1
Merge pull request !1134 from dev_ljm_20241129
|
2025-01-05 13:35:54 +00:00 |
|
|
ljmwkx
|
e68a5ee650
|
1
|
2025-01-05 21:34:41 +08:00 |
|
|
李鹏宇
|
053bde08d4
|
ljm 1
|
2025-01-05 19:04:48 +08:00 |
|
|
ljm
|
d9ecb1ce88
|
!1132 模板 需要什么加什么
Merge pull request !1132 from dev_ljm_20241129
|
2025-01-05 07:02:44 +00:00 |
|
|
ljmwkx
|
b6ee61d410
|
模板 需要什么加什么
|
2025-01-05 15:00:49 +08:00 |
|
|
李鹏宇
|
707f3b16f1
|
!1130 结束
Merge pull request !1130 from 李鹏宇/dev_zhou
|
2025-01-04 11:59:26 +00:00 |
|
|
zhou
|
171b2e24a5
|
添加功能
|
2025-01-04 19:58:53 +08:00 |
|
|
李鹏宇
|
b02a132e33
|
!1128 结束
Merge pull request !1128 from 李鹏宇/dev_zhou
|
2025-01-04 11:57:16 +00:00 |
|
|
zhou
|
33d1a676f9
|
添加功能
|
2025-01-04 19:56:54 +08:00 |
|
|
zhou
|
2490014a2c
|
添加功能
|
2025-01-04 19:55:43 +08:00 |
|
|
李鹏宇
|
1d5a60703b
|
!1126 结束
Merge pull request !1126 from 李鹏宇/dev_zhou
|
2025-01-04 10:57:10 +00:00 |
|
|
zhou
|
099dc7b394
|
添加功能
|
2025-01-04 18:56:37 +08:00 |
|
|
ljm
|
74dc37f258
|
!1125 1
Merge pull request !1125 from dev_ljm_20241129
|
2025-01-04 10:43:45 +00:00 |
|
|
ljmwkx
|
18d5d97394
|
暂时提交一版
|
2025-01-04 18:42:30 +08:00 |
|
|
李鹏宇
|
118e67f819
|
!1123 结束
Merge pull request !1123 from 李鹏宇/dev_zhou
|
2025-01-04 10:03:15 +00:00 |
|
|
zhou
|
0e3b8f4dd1
|
添加功能
|
2025-01-04 18:02:51 +08:00 |
|
|
李鹏宇
|
d07fafce5e
|
ljm 1
|
2025-01-04 17:50:35 +08:00 |
|
|
李鹏宇
|
7c40501b81
|
!1122 结束
Merge pull request !1122 from 李鹏宇/dev
|
2025-01-04 08:07:52 +00:00 |
|
|
李鹏宇
|
d0d3ebc4ff
|
!1121 结束
Merge pull request !1121 from 李鹏宇/dev_zhou
|
2025-01-04 08:07:27 +00:00 |
|
|
zhou
|
dfaa2779d7
|
添加功能
|
2025-01-04 16:06:59 +08:00 |
|
|
zhou
|
73af988b83
|
添加功能
|
2025-01-04 16:06:45 +08:00 |
|
|
李鹏宇
|
53e93b485e
|
!1120 结束
Merge pull request !1120 from 李鹏宇/dev
|
2025-01-04 07:07:28 +00:00 |
|
|
李鹏宇
|
e8e332d665
|
!1119 结束
Merge pull request !1119 from 李鹏宇/dev_zhou
|
2025-01-04 07:07:09 +00:00 |
|
|
zhou
|
4d8938bdad
|
添加功能
|
2025-01-04 15:06:43 +08:00 |
|
|
李鹏宇
|
7693ee7b9f
|
!1118 结束
Merge pull request !1118 from 李鹏宇/dev
|
2025-01-04 07:05:32 +00:00 |
|
|
李鹏宇
|
2ee81d8292
|
!1117 结束
Merge pull request !1117 from 李鹏宇/dev_zhou
|
2025-01-04 07:05:13 +00:00 |
|
|
zhou
|
df07a8cb94
|
添加功能
|
2025-01-04 15:04:45 +08:00 |
|
|
李鹏宇
|
57e0536317
|
!1116 结束
Merge pull request !1116 from 李鹏宇/dev
|
2025-01-04 06:30:44 +00:00 |
|
|
李鹏宇
|
6a67c6f660
|
!1115 结束
Merge pull request !1115 from 李鹏宇/dev_zhou
|
2025-01-04 06:30:20 +00:00 |
|
|
zhou
|
306facc1df
|
添加功能
|
2025-01-04 14:29:03 +08:00 |
|
|
ljm
|
0b2e2d1f36
|
!1114 1
Merge pull request !1114 from dev_ljm_20241129
|
2025-01-04 04:34:38 +00:00 |
|
|
ljmwkx
|
ae11e8d4de
|
暂时提交一版
|
2025-01-04 12:33:59 +08:00 |
|
|
ljm
|
bafb50e540
|
!1113 1
Merge pull request !1113 from dev_ljm_20241129
|
2025-01-04 04:24:44 +00:00 |
|
|
ljmwkx
|
42f5341916
|
增加公休判断，暂未测试
|
2025-01-04 12:23:09 +08:00 |
|
|
李鹏宇
|
6241c450c6
|
!1112 结束
Merge pull request !1112 from 李鹏宇/dev_zhou
|
2025-01-04 04:17:34 +00:00 |
|
|
zhou
|
94e91d97ac
|
Merge branch 'dev' into dev_zhou
# Conflicts:
# yuthon_property_approval/views/property_lease_contract.xml
|
2025-01-04 12:15:19 +08:00 |
|
|
zhou
|
6f6e7f158a
|
添加功能
|
2025-01-04 12:13:07 +08:00 |
|
|
李鹏宇
|
38e146c6b6
|
!1111 结束
Merge pull request !1111 from 李鹏宇/dev
|
2025-01-04 02:13:45 +00:00 |
|
|
李鹏宇
|
d59fbc9595
|
!1110 结束
Merge pull request !1110 from 李鹏宇/dev_zhou
|
2025-01-04 02:13:25 +00:00 |
|
|
zhou
|
7c4fbac40e
|
添加功能
|
2025-01-04 10:11:26 +08:00 |
|
|
李鹏宇
|
217ad0b784
|
!1109 结束
Merge pull request !1109 from 李鹏宇/dev
|
2025-01-04 02:02:33 +00:00 |
|
|
李鹏宇
|
b375ff81c0
|
!1108 结束
Merge pull request !1108 from 李鹏宇/dev_zhou
|
2025-01-04 02:02:14 +00:00 |
|
|
zhou
|
891d956160
|
添加功能
|
2025-01-04 10:01:14 +08:00 |
|
|
李鹏宇
|
55a82662b4
|
!1107 pengyu
Merge pull request !1107 from 李鹏宇/dev
|
2025-01-04 01:52:24 +00:00 |
|
|
李鹏宇
|
538577a9e1
|
ljm 1
|
2025-01-04 09:49:47 +08:00 |
|
|
李鹏宇
|
ba981242cf
|
ljm 1
|
2025-01-03 22:01:29 +08:00 |
|