221 Commits

Author	SHA1	Message	Date
jhc	b0c08f0cde	Merge branch 'oa' into dev	2023-05-18 18:35:56 +08:00
jhc	42b13a6945	修改	2023-05-18 18:35:42 +08:00
jhc	7d61d8b0c7	Merge branch 'oa' into dev	2023-05-18 18:32:30 +08:00
jhc	19fcc01688	修改	2023-05-18 18:32:17 +08:00
jhc	94950c1fbb	Merge branch 'oa' into dev	2023-05-18 18:23:58 +08:00
jhc	d7af19ef70	修改	2023-05-18 18:23:49 +08:00
jhc	b9b389e25c	Merge branch 'oa' into dev	2023-05-18 18:21:37 +08:00
jhc	69d84a0efc	修改	2023-05-18 18:21:20 +08:00
jhc	025d306d67	Merge branch 'oa' into dev	2023-05-18 18:13:12 +08:00
jhc	a39facfe63	修改	2023-05-18 18:12:58 +08:00
jhc	520b11b369	Merge branch 'oa' into dev	2023-05-18 16:13:41 +08:00
jhc	b58c70825f	oa 审批 类型筛选	2023-05-18 16:13:28 +08:00
jhc	58b79614af	Merge branch 'oa' into dev	2023-05-16 15:42:38 +08:00
jhc	65a53f905d	leaveApply 添加 leaveBalance 字段	2023-05-16 15:42:19 +08:00
jhc	2ce5ae8dd6	Merge branch 'oa' into dev	2023-05-16 13:30:42 +08:00
jhc	2c5f6df7e8	添加 输出	2023-05-16 13:30:31 +08:00
jhc	b770c2de2c	修改 update oa	2023-05-16 13:28:23 +08:00
jhc	ec7fe28657	Merge branch 'oa' into dev	2023-05-16 11:57:16 +08:00
jhc	8518a5e877	修改	2023-05-16 11:57:06 +08:00
jhc	ddc1b4f554	Merge branch 'oa' into dev	2023-05-16 11:01:17 +08:00
jhc	88c6f7b29a	修改	2023-05-16 11:00:59 +08:00
jhc	1750437dfb	Merge branch 'oa' into dev	2023-05-16 10:52:38 +08:00
jhc	8588b16469	添加字段 BundlePayPrice -> rollback	2023-05-16 10:52:24 +08:00
jhc	8f5015a173	Merge branch 'oa' into dev	2023-05-16 10:46:21 +08:00
jhc	660bbce0c9	修改,画展包付款单添加rollback	2023-05-16 10:46:04 +08:00
jhc	138e9087e1	Merge branch 'oa' into dev	2023-05-15 10:24:20 +08:00
jhc	e23bab0b50	修改	2023-05-15 10:24:07 +08:00
jhc	55c61ec640	Merge branch 'oa' into dev	2023-05-15 10:16:19 +08:00
jhc	7edc94505a	修改	2023-05-15 10:15:59 +08:00
jhc	e7f3e6f5ad	Merge branch 'oa' into dev	2023-05-15 09:59:50 +08:00
jhc	02fda9646c	修改	2023-05-15 09:59:38 +08:00
jhc	b640658f98	Merge branch 'oa' into dev	2023-05-15 09:42:17 +08:00
jhc	f6a7448cb3	修改	2023-05-15 09:42:02 +08:00
jhc	803fbd1030	Merge branch 'oa' into dev	2023-05-15 09:21:08 +08:00
jhc	ebc8f61f49	修改	2023-05-15 09:20:53 +08:00
jhc	4516cabe82	Merge branch 'oa' into dev	2023-05-15 09:16:37 +08:00
jhc	fd10885573	修改	2023-05-15 09:16:23 +08:00
jhc	ed6665a70b	Merge branch 'oa' into dev	2023-05-12 17:39:51 +08:00
jhc	9e96e6310c	修改	2023-05-12 17:39:31 +08:00
jhc	9fcdbb5194	Merge branch 'oa' into dev	2023-05-12 17:33:47 +08:00
jhc	815f7273db	修改	2023-05-12 17:33:33 +08:00
jhc	9f9ff4e3de	Merge branch 'oa' into dev	2023-05-12 17:29:23 +08:00
jhc	73075d6be9	修海	2023-05-12 17:29:04 +08:00
jhc	f94041918f	Merge branch 'oa' into dev	2023-05-12 17:26:28 +08:00
jhc	a55529b1bb	修改	2023-05-12 17:26:12 +08:00
jhc	708733e99a	Merge branch 'oa' into dev	2023-05-12 17:14:06 +08:00
jhc	f4c7bc7b03	修改	2023-05-12 17:13:40 +08:00
jhc	19460c5fdc	修改冲突	2023-05-12 16:25:03 +08:00
jhc	fc0865f83b	修改	2023-05-12 16:24:12 +08:00
jhc	58c1ab43f1	修改	2023-05-12 16:22:29 +08:00
jhc	83845f8037	Merge branch 'oa' into dev	2023-05-12 16:17:26 +08:00
jhc	0e381a32dc	修改	2023-05-12 16:17:08 +08:00
jhc	5740aea1a3	Merge branch 'oa' into dev	2023-05-12 16:08:56 +08:00
jhc	2061ae57f1	修改	2023-05-12 16:08:40 +08:00
jhc	cc7ff8cf0e	Merge branch 'oa' into dev	2023-05-12 16:03:13 +08:00
jhc	8584515c4f	修改	2023-05-12 16:02:56 +08:00
jhc	c26bc2f3a9	Merge branch 'oa' into dev	2023-05-12 15:58:42 +08:00
jhc	5b97610544	修改问题	2023-05-12 15:58:26 +08:00
jhc	de2ec5267c	Merge branch 'oa' into dev	2023-05-12 15:24:45 +08:00
jhc	0ec7533677	修改	2023-05-12 15:24:28 +08:00
jhc	a24a215b35	修改	2023-05-12 15:16:36 +08:00
jhc	7e44924c18	Merge branch 'oa' into dev	2023-05-12 15:11:50 +08:00
jhc	25a7a42329	修改	2023-05-12 15:11:36 +08:00
jhc	48a3a59c0f	取消 applyTimes 赋值	2023-05-12 14:54:28 +08:00
jhc	a616b677ba	Merge branch 'oa' into dev	2023-05-12 14:50:31 +08:00
jhc	3a329b0a05	修改	2023-05-12 14:50:15 +08:00
jhc	e5463203ee	Merge branch 'oa' into dev	2023-05-12 14:47:30 +08:00
jhc	568526bb23	输出 approval_oa	2023-05-12 14:47:17 +08:00
jhc	97e59297ca	Merge branch 'oa' into dev	2023-05-12 14:38:33 +08:00
jhc	b6b5b0e654	输出 approval_oa	2023-05-12 14:38:17 +08:00
jhc	9095e3f01b	Merge branch 'oa' into dev	2023-05-12 14:33:58 +08:00
jhc	69e0b9858f	输出 approval_oag	2023-05-12 14:33:40 +08:00
jhc	4fca4a1f98	Merge branch 'oa' into dev	2023-05-12 14:27:28 +08:00
jhc	3840a48571	修改 赋值	2023-05-12 14:27:15 +08:00
jhc	88090ec1eb	Merge branch 'oa' into dev	2023-05-12 10:59:14 +08:00
jhc	9f29def7f2	更新 oa审批的uuid到审批	2023-05-12 10:58:35 +08:00
jhc	ea8e5eb17f	Merge branch 'oa' into dev	2023-05-08 16:46:18 +08:00
jhc	e1610eb019	调整	2023-05-08 16:46:05 +08:00
jhc	4d7f3a672f	Merge branch 'oa' into dev	2023-05-08 10:52:16 +08:00
jhc	874c6d377a	oa审批	2023-05-08 10:52:00 +08:00
jhc	57397737d2	修改 pb	2023-05-04 10:43:48 +08:00
jhc	844730ad0b	修改	2023-05-04 10:17:33 +08:00
jhc	05cc84845d	修改冲突	2023-05-04 10:15:50 +08:00
jhc	c48a390a88	Merge branch 'jhc' into dev	2023-04-26 20:48:55 +08:00
jhc	730e2b869e	修复	2023-04-26 20:48:38 +08:00
jhc	a8ce2cb45e	Merge branch 'jhc' into dev	2023-04-26 20:46:12 +08:00
jhc	aedf8f525a	画展包 添加经纪人字段	2023-04-26 20:45:52 +08:00
jhc	155c3d7477	Merge branch 'jhc' into dev	2023-04-25 15:31:30 +08:00
jhc	2462790f40	修改	2023-04-25 15:27:49 +08:00
jhc	e3e93400cb	Merge branch 'jhc' into dev	2023-04-25 15:25:47 +08:00
jhc	f92a39033b	修改	2023-04-25 15:25:30 +08:00
jhc	5942b76a3f	修改	2023-04-25 15:17:46 +08:00
jhc	4c6a62a184	Merge branch 'jhc' into dev	2023-04-25 14:42:33 +08:00
jhc	4d770592d1	调整	2023-04-25 14:42:24 +08:00
jhc	8553921da8	Merge branch 'jhc' into dev	2023-04-25 14:15:25 +08:00
jhc	40d41ba7ea	修改	2023-04-25 14:15:05 +08:00
jhc	b4a1074513	Merge branch 'jhc' into dev	2023-04-25 13:30:52 +08:00
jhc	f4bf38893d	添加 serializer:json	2023-04-25 13:30:32 +08:00
jhc	9dd1d3bd53	Merge branch 'jhc' into dev	2023-04-25 13:22:20 +08:00
jhc	d8271cbbda	修改 copier复制	2023-04-25 13:22:06 +08:00