Commit Graph

2557 Commits

Author SHA1 Message Date
aixianling
53f9434f53 Merge remote-tracking branch 'origin/dev' into dev 2022-08-11 10:30:51 +08:00
aixianling
cb57ac7b48 整合代码 2022-08-11 10:30:31 +08:00
shijingjing
e404cc1417 积分 2022-08-11 09:54:52 +08:00
yanran200730
bcec48bdbf Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-11 09:28:51 +08:00
yanran200730
188d0ed258 郫都大屏 2022-08-11 09:28:44 +08:00
liuye
a9a466cca5 选择部门 2022-08-11 09:15:22 +08:00
yanran200730
ff8120d1b5 30786 2022-08-11 08:21:56 +08:00
yanran200730
e4707cb090 30798 2022-08-11 08:14:04 +08:00
shijingjing
3d13fd5d54 积分明细 2022-08-10 18:53:38 +08:00
aixianling
54c79d94fb Merge remote-tracking branch 'origin/dev' into dev 2022-08-10 18:06:22 +08:00
aixianling
bcabbb8a6a 新增流程组件 2022-08-10 18:06:09 +08:00
yanran200730
98f732a7cf Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-10 18:01:26 +08:00
yanran200730
9c47fb9a16 郫都大屏 2022-08-10 18:01:19 +08:00
aixianling
5ba4df87fb 展示流程ID 2022-08-10 17:44:06 +08:00
aixianling
6b173f2c29 Merge remote-tracking branch 'origin/dev' into dev 2022-08-10 17:41:56 +08:00
aixianling
55da7871ee 流程台账界面完成 2022-08-10 17:41:42 +08:00
yanran200730
bd67f05f91 郫都大屏 2022-08-10 17:26:44 +08:00
yanran200730
f871cefbad 郫都大屏 2022-08-10 17:25:31 +08:00
yanran200730
83b7bdef8d 郫都大屏 2022-08-10 17:19:01 +08:00
yanran200730
46124ecf9c Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-10 17:03:25 +08:00
yanran200730
97181c4e8d 30796 2022-08-10 17:03:18 +08:00
aixianling
bf1348fa63 Merge remote-tracking branch 'origin/dev' into dev 2022-08-10 16:59:09 +08:00
aixianling
c5b2b233b2 工作流配置完成 2022-08-10 16:58:52 +08:00
yanran200730
36e189f569 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-10 16:49:39 +08:00
yanran200730
43976b674a bug 2022-08-10 16:49:32 +08:00
shijingjing
c9c552bd4a 积分管理 2022-08-10 16:47:22 +08:00
yanran200730
7b0a7bf741 郫都大屏 2022-08-10 15:19:57 +08:00
yanran200730
1c41f96f04 郫都大屏 2022-08-10 14:54:19 +08:00
yanran200730
bd228bcd91 郫都大屏 2022-08-10 14:49:21 +08:00
yanran200730
fbb9271966 郫都大屏 2022-08-10 11:37:02 +08:00
yanran200730
6598c138c0 郫都大屏 2022-08-10 11:28:34 +08:00
yanran200730
01a9997c86 郫都大屏 2022-08-10 11:27:25 +08:00
yanran200730
605599efc4 大屏 2022-08-10 11:15:13 +08:00
yanran200730
25ca7f4027 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-10 11:14:05 +08:00
yanran200730
f28e915c4a 大屏 2022-08-10 11:14:00 +08:00
aixianling
3d386d76e4 BUG 30793 2022-08-10 11:10:36 +08:00
aixianling
b001ef0bd5 Merge remote-tracking branch 'origin/dev' into dev 2022-08-10 11:07:05 +08:00
aixianling
73a26d8560 优化字典类 2022-08-10 11:06:49 +08:00
yanran200730
fa37a9cfc0 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-10 10:59:19 +08:00
yanran200730
b33faf19f7 大屏 2022-08-10 10:59:13 +08:00
aixianling
09d96a3c95 Merge remote-tracking branch 'origin/dev' into dev 2022-08-10 10:18:55 +08:00
aixianling
eb2d76de61 BUG 30794 2022-08-10 10:18:35 +08:00
yanran200730
4f6d6b9e77 bug 2022-08-10 09:55:22 +08:00
shijingjing
c0302ce05c 数组转树形结构 2022-08-10 09:47:45 +08:00
liuye
c06d38bb5f 宣发效果时间格式 2022-08-10 09:29:47 +08:00
aixianling
9bd1f380be Merge remote-tracking branch 'origin/dev' into dev 2022-08-09 17:56:18 +08:00
aixianling
caeaccef37 BUG 30792 2022-08-09 17:55:59 +08:00
yanran200730
9bd9a1375c Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-09 17:52:39 +08:00
yanran200730
e2c7e81482 30791 2022-08-09 17:52:30 +08:00
shijingjing
c6f3552c56 no message 2022-08-09 17:39:20 +08:00