Commit Graph
22730 Commits
Author SHA1 Message Date
zhouzhou 21e1f5e9a4 Merge branch 'refs/heads/dev' into dev_zhou 2024-10-25 17:41:16 +08:00
李鹏宇 8e61eda51f pengyuthon 2024-10-25 17:37:38 +08:00
李鹏宇 417a951fbe !333 zhou
Merge pull request !333 from 李鹏宇/dev
2024-10-24 12:57:43 +00:00
zhouzhou a2df19aaf5 Merge branch 'refs/heads/dev' into dev_zhou 2024-10-24 20:52:51 +08:00
李鹏宇 ddc4dacc61 pengyuthon 2024-10-24 20:49:38 +08:00
zhouzhou 9a0bf45867 Merge branch 'dev' into dev_zhou 2024-10-24 16:08:43 +08:00
李鹏宇 fb8b6bd6cd !332 zhou
Merge pull request !332 from 李鹏宇/dev_zhou
2024-10-24 08:08:16 +00:00
李鹏宇 9ded40b6f3 pengyuthon 2024-10-24 16:00:38 +08:00
zhouzhou 5e536cedcb Merge branch 'dev' into dev_zhou 2024-10-24 15:56:09 +08:00
李鹏宇 808a0e67eb pengyuthon 2024-10-24 15:47:55 +08:00
zhouzhou 5028b89a0d Merge branch 'dev' into dev_zhou 2024-10-24 15:44:01 +08:00
zhouzhou 47e92241e7 添加功能 2024-10-24 07:43:07 +00:00
李鹏宇 d03931affa pengyuthon 2024-10-24 07:43:07 +00:00
李鹏宇 5d69a9baf5 pengyuthon 2024-10-24 15:40:39 +08:00
zhouzhou 85d1b4385e 添加功能 2024-10-24 15:25:58 +08:00
李鹏宇 bc2fa675d7 pengyuthon 2024-10-24 11:43:26 +08:00
李鹏宇 fea3d60c22 !328 zhou
Merge pull request !328 from 李鹏宇/dev
2024-10-23 13:28:45 +00:00
李鹏宇 35dac03036 pengyuthon 2024-10-23 21:14:59 +08:00
李鹏宇 c6414dc648 !327 zhou
Merge pull request !327 from 李鹏宇/dev
2024-10-23 12:27:02 +00:00
李鹏宇 53ae1b8f0c pengyuthon 2024-10-23 20:25:53 +08:00
李鹏宇 0b369559dd !326 zhou
Merge pull request !326 from 李鹏宇/dev_zhou
2024-10-23 12:01:11 +00:00
zhouzhou 1d0f135be2 添加功能 2024-10-23 19:59:50 +08:00
李鹏宇 8560fdd763 !325 zhou
Merge pull request !325 from 李鹏宇/dev_zhou
2024-10-23 10:59:12 +00:00
zhouzhou 476d570839 Merge branch 'dev' into dev_zhou
# Conflicts:
#	yuthon_issue/security/ir.model.access.csv
#	yuthon_issue/security/issue_security_group.xml
2024-10-23 18:58:02 +08:00
zhouzhou 72619f54fd 添加功能 2024-10-23 18:53:34 +08:00
李鹏宇 feb7148e30 !324 zhou
Merge pull request !324 from 李鹏宇/dev_zhou
2024-10-23 02:57:47 +00:00
zhouzhou edaf573186 添加功能 2024-10-23 10:56:22 +08:00
李鹏宇 503f7fd801 !323 pengyuthon
Merge pull request !323 from 李鹏宇/dev
2024-10-22 14:10:30 +00:00
李鹏宇 27f46856dc pengyuthon 2024-10-22 22:08:18 +08:00
李鹏宇 aa73bedf3a !321 设备
Merge pull request !321 from 李鹏宇/dev
2024-10-22 14:06:22 +00:00
zhouzhou 005111da25 添加功能 2024-10-22 22:04:48 +08:00
李鹏宇 d399e90a1b pengyuthon 2024-10-22 22:04:18 +08:00
李鹏宇 b73b288f13 !320 pengyuthon
Merge pull request !320 from 李鹏宇/dev
2024-10-22 13:20:56 +00:00
李鹏宇 2f4b367433 pengyuthon 2024-10-22 21:19:55 +08:00
李鹏宇 f69a461a0e !319 pengyuthon
Merge pull request !319 from 李鹏宇/dev
2024-10-22 12:48:16 +00:00
李鹏宇 d6413da5e4 pengyuthon 2024-10-22 20:47:34 +08:00
李鹏宇 93b059a9d8 !318 pengyuthon
Merge pull request !318 from 李鹏宇/dev
2024-10-22 12:40:50 +00:00
李鹏宇 e7e477d8a7 !317 zhou
Merge pull request !317 from 李鹏宇/dev_zhou
2024-10-22 10:19:44 +00:00
zhouzhou 93fa4e2d2e 添加功能 2024-10-22 18:17:51 +08:00
李鹏宇 c1e182f5b1 !316 zhou
Merge pull request !316 from 李鹏宇/dev_zhou
2024-10-22 10:09:32 +00:00
zhouzhou 2eb2f2c67f 添加功能 2024-10-22 18:06:04 +08:00
李鹏宇 47f2892637 !314 zhou
Merge pull request !314 from 李鹏宇/dev_zhou
2024-10-22 08:08:25 +00:00
zhouzhou e1a3946a0b 添加功能 2024-10-22 15:35:31 +08:00
李鹏宇 e350c1a1d3 !313 zhou
Merge pull request !313 from 李鹏宇/dev_zhou
2024-10-22 07:06:37 +00:00
zhouzhou 9813d3c3ff 添加功能 2024-10-22 15:04:58 +08:00
李鹏宇 c3dbcefe81 !312 zhou
Merge pull request !312 from 李鹏宇/dev_zhou
2024-10-22 03:06:39 +00:00
zhouzhou 846a824a4f 添加功能 2024-10-22 11:05:08 +08:00
zhouzhou f35b9e33f4 添加功能 2024-10-22 11:04:44 +08:00
李鹏宇 8a863bb833 pengyuthon 2024-10-21 21:46:03 +08:00
李鹏宇 87786edd84 !311 zhou
Merge pull request !311 from 李鹏宇/dev_zhou
2024-10-21 12:49:04 +00:00