Commit Graph

Select branches

Hide Pull Requests

20221123v1.0封版

custom/上海港湾备份

custom/拓荆科技有限公司

custom/浙文眼镜

cx0418hd

danikor

develop

feature/cl

feature/detach

feature/djp

feature/dxf

feature/geoharbour

feature/hs

feature/jiazhao

feature/jiazhao_nodetach

feature/jingyou

feature/ml

feature/mogen

feature/简阳

master

oracle

release

test

ybgc

上海中远重工组织架构图

上海汽车芯片工程中心

上海港湾

上海顺胜组织架构图v2

中国民用航空华北地区空中交通管理局

五院杭州中心

多语言修改前备份

大王椰组织调整工作流提醒

大王椰非标升级二开备份

宜通世纪科技股份有限公司

山西国药控股有限公司

成都运达科技股份有限公司

#1

#1

#10

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#12

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#14

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#159

#16

#16

#160

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#189

#19

#19

#190

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#218

#219

#219

#22

#22

#220

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#238

#239

#239

#24

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#246

#247

#248

#249

#25

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#3

#30

#30

#31

#31

#32

#32

#33

#33

#34

#34

#35

#35

#36

#36

#37

#37

#38

#38

#39

#39

#4

#4

#40

#40

#41

#41

#42

#42

#43

#43

#44

#44

#45

#45

#46

#46

#47

#47

#48

#48

#49

#49

#5

#5

#50

#50

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#75

#75

#76

#76

#77

#77

#78

#78

#79

#79

#8

#8

#80

#80

#81

#81

#82

#82

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#98

#99

#99

Mono Color

• 594173175c 更新人员Map表信息 dxfeng 2022-10-25 08:59:24 +0800
• 3cf48e443a Merge pull request '人员导入、花名册左侧树BUG修复' (#23) from feature/dxf into develop dxfeng 2022-10-24 19:07:17 +0800
• b446dbdb53 人员导入、花名册左侧树BUG修复 dxfeng 2022-10-24 19:06:07 +0800
• f30998351f Merge remote-tracking branch 'origin/develop' into feature/ml ‘ml’ 2022-10-24 16:01:51 +0800
• 65ccecce56 分部、部门、岗位禁用修复1024 ‘ml’ 2022-10-24 16:00:00 +0800
• 7e1e1eae5c Merge pull request 'SQL脚本、编制导入模板、人员卡片、组织架构图Oracle' (#22) from feature/dxf into develop dxfeng 2022-10-24 15:57:46 +0800
• dca18ea5b1 编制导入模板、人员卡片、组织架构图Oracle dxfeng 2022-10-24 15:57:08 +0800
• d9bdda1fa6 SQL脚本调整 dxfeng 2022-10-24 15:56:03 +0800
• 771996f138 Merge pull request '人员相关BUG修复' (#21) from feature/dxf into develop dxfeng 2022-10-21 17:46:00 +0800
• 3b4c59ae8c 人员相关BUG修复 dxfeng 2022-10-21 17:44:53 +0800
• 2515121d83 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-10-21 15:58:13 +0800
• 11a4a85ff1 人员关联调整 dxfeng 2022-10-21 15:57:55 +0800
• 05fe14b5e1 分部转移、部门转移、岗位合并修复1021 ‘ml’ 2022-10-21 15:53:15 +0800
• 444153f44d Merge remote-tracking branch 'origin/develop' into feature/ml ‘ml’ 2022-10-21 15:52:37 +0800
• 89554625ca Merge pull request 'develop' (#20) from develop into master liang.cheng 2022-10-21 10:24:27 +0800
• 1708f8e821 Merge pull request '建表' (#19) from feature/cl into develop liang.cheng 2022-10-21 10:03:23 +0800
• 545ec88e07 建表 Chengliang 2022-10-21 10:01:37 +0800
• 887a1eafe3 Merge remote-tracking branch 'origin/develop' into feature/ml ‘ml’ 2022-10-21 09:47:27 +0800
• 7004300ebb Merge pull request '人员关联调整' (#18) from feature/dxf into develop dxfeng 2022-10-21 09:32:27 +0800
• 275b017db1 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-10-21 09:31:06 +0800
• 52c8b86adb 人员关联调整 dxfeng 2022-10-21 09:28:33 +0800
• 9a9b79cff0 Merge remote-tracking branch 'origin/develop' into feature/ml ‘ml’ 2022-10-20 17:31:23 +0800
• a0660a7857 分部转移、部门转移、岗位合并修复1020 ‘ml’ 2022-10-20 17:30:34 +0800
• c06ea6f2a7 Merge pull request '人员关联调整、BUG修复' (#17) from feature/dxf into develop dxfeng 2022-10-20 09:09:20 +0800
• b7e34c1d31 人员关联调整 dxfeng 2022-10-20 09:07:32 +0800
• a5687b3995 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-10-19 15:42:01 +0800
• 1c4ee05f95 人事卡片BUG修复 dxfeng 2022-10-19 15:39:21 +0800
• adc92c8287 部门合并在岗数优化1019 ‘ml’ 2022-10-19 15:38:47 +0800
• eb007f5b23 人事卡片BUG修复 dxfeng 2022-10-18 16:35:08 +0800
• 5005243758 部门合并在岗数优化 ‘ml’ 2022-10-18 12:17:11 +0800
• 95f81a4f00 Merge pull request '人员BUG修复' (#16) from feature/dxf into develop dxfeng 2022-10-18 11:42:20 +0800
• 414aefe41c 人事卡片BUG修复 dxfeng 2022-10-18 11:41:11 +0800
• 63b6b88a96 人员管理BUG修复 dxfeng 2022-10-17 17:16:26 +0800
• 0f57462192 Merge pull request 'BUG修复' (#15) from feature/dxf into develop dxfeng 2022-10-17 13:49:47 +0800
• 396a4570d0 BUG修复 dxfeng 2022-10-17 11:35:46 +0800
• 85fb8a1d19 Merge pull request '人员卡片BUG修复' (#14) from feature/dxf into develop dxfeng 2022-10-17 09:40:29 +0800
• 561477c47e Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-10-17 09:36:23 +0800
• cd4d2c77bf 人员卡片BUG修复 dxfeng 2022-10-17 09:36:08 +0800
• 10a3921d54 Merge pull request '分部、岗位 禁用功能限制' (#13) from feature/dxf into develop dxfeng 2022-10-14 15:01:23 +0800
• f36756e1fd 分部、岗位 禁用功能限制 dxfeng 2022-10-14 14:56:35 +0800
• e2d988d83b Merge pull request '部门转移BUG修复' (#12) from feature/dxf into develop dxfeng 2022-10-14 11:34:40 +0800
• 4a85fc46aa 部门转移BUG修复 dxfeng 2022-10-14 11:33:24 +0800
• cb5235a16c Merge pull request '人员卡片' (#11) from feature/dxf into develop dxfeng 2022-10-14 11:07:51 +0800
• 1d7389c872 人员卡片 dxfeng 2022-10-14 11:06:15 +0800
• 48c8101a34 Merge pull request 'feature/dxf' (#10) from feature/dxf into develop dxfeng 2022-10-14 09:16:42 +0800
• b2670001b4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-10-14 09:15:39 +0800
• f9c33da655 人员管理完善 dxfeng 2022-10-14 09:13:28 +0800
• 46068ab008 编制Action 添加提示信息，BUG修复 dxfeng 2022-10-13 13:59:41 +0800
• 585746c723 Merge pull request 'feature/dxf' (#9) from feature/dxf into develop dxfeng 2022-10-12 15:30:37 +0800
• c538a6205f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-10-12 15:28:32 +0800
• 3ac7c2b959 聚才林花名册 dxfeng 2022-10-12 15:28:11 +0800
• f26159506a 岗位浏览按钮、编制action BUG修复 dxfeng 2022-10-12 15:23:24 +0800
• c78f2157f8 层级显示不一致优化 ‘ml’ 2022-10-10 18:24:07 +0800
• b31d5943bd Merge pull request '编制删除' (#8) from feature/cl into develop liang.cheng 2022-10-10 17:37:56 +0800
• eb5578fd64 编制删除 Chengliang 2022-10-10 17:35:48 +0800
• 9df3349715 兼容EC岗位名称重复 dxfeng 2022-10-09 15:36:53 +0800
• eb8424816f Merge pull request 'feature/dxf' (#7) from feature/dxf into develop dxfeng 2022-10-09 11:45:37 +0800
• a7a3d1e0e5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-10-09 11:43:27 +0800
• 231addfda1 人事卡片接口开发 dxfeng 2022-10-09 11:42:26 +0800
• 8289ae1c56 Merge pull request 'feature/dxf' (#6) from feature/dxf into develop dxfeng 2022-09-30 15:31:48 +0800
• ed937c9fb6 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-09-30 15:26:10 +0800
• 284f778963 人员调整,在岗数关联优化 dxfeng 2022-09-30 15:19:22 +0800
• acee0bad51 人员调整,在岗数关联优化 dxfeng 2022-09-30 11:05:42 +0800
• dfb3067297 Merge pull request '组织架构图编制、在岗,数据优化' (#5) from feature/dxf into develop dxfeng 2022-09-30 09:12:17 +0800
• c6fb0d129b 组织架构图编制、在岗,数据优化 dxfeng 2022-09-29 15:57:00 +0800
• f16391fc9b Merge pull request 'bug' (#4) from feature/cl into develop liang.cheng 2022-09-29 10:29:35 +0800
• ca3a093357 bug Chengliang 2022-09-29 10:28:04 +0800
• cc77f3a6db Merge pull request 'feature/dxf' (#3) from feature/dxf into develop dxfeng 2022-09-23 15:57:06 +0800
• 02836ce37d 岗位名称校验、编制展示优化、BUG修复 dxfeng 2022-09-23 15:53:37 +0800
• 92d9a17d8c 组织架构图编制显示优化 dxfeng 2022-09-23 09:19:42 +0800
• 106d7e8bb8 更新人员、编制 同步组织架构图 dxfeng 2022-09-21 16:23:09 +0800
• 02e3a40cb7 Merge pull request 'feature/dxf' (#2) from feature/dxf into develop dxfeng 2022-09-21 10:49:15 +0800
• 7eb7a93397 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-09-21 10:45:26 +0800
• a847a4efef 兼容Oracle,达梦 dxfeng 2022-09-21 10:43:41 +0800
• 8a9370ee9e BUG修复 dxfeng 2022-09-20 18:46:05 +0800
• aa48ea933f Merge pull request '测试' (#1) from feature/cl into develop liang.cheng 2022-09-20 14:26:48 +0800
• 61aabb4ca1 测试 Chengliang 2022-09-20 14:24:26 +0800
• 38725f97b0 BUG修复 dxfeng 2022-09-20 14:19:46 +0800
• 7d99eb0a3a
  !244 BUG修复 Merge pull request !244 from dxfeng/feature/dxf dxfeng 2022-09-20 02:25:53 +0000
• 30b3255ea0
  Pre Merge pull request !244 from dxfeng/feature/dxf dxfeng 2022-09-20 02:25:36 +0000
• 2632f6c857 BUG修复 dxfeng 2022-09-20 10:25:13 +0800
• b214ec8509 BUG修复 dxfeng 2022-09-20 09:18:24 +0800
• 672f0f9e11 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf dxfeng 2022-09-19 13:28:14 +0800
• fe668c37e7 BUG修复 dxfeng 2022-09-19 13:27:50 +0800
• c49abcf77f BUG修复 dxfeng 2022-09-16 16:56:30 +0800
• c8eb2f3451 BUG修复 dxfeng 2022-09-16 14:48:00 +0800
• abf5840f72
  !243 BUG修复 Merge pull request !243 from dxfeng/feature/dxf dxfeng 2022-09-16 03:29:20 +0000
• ca952900e7
  Pre Merge pull request !243 from dxfeng/feature/dxf dxfeng 2022-09-16 03:29:00 +0000
• 1b4d7203b8 BUG修复 dxfeng 2022-09-16 11:28:47 +0800
• b494a6a96e BUG修复 dxfeng 2022-09-16 11:01:31 +0800
• e9e585990a
  !242 BUG修复 Merge pull request !242 from dxfeng/feature/dxf dxfeng 2022-09-16 02:23:08 +0000
• ae908b5201
  Pre Merge pull request !242 from dxfeng/feature/dxf dxfeng 2022-09-16 02:22:54 +0000
• ca66929235 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf dxfeng 2022-09-16 10:22:52 +0800
• 29295bb464 BUG修复 dxfeng 2022-09-16 10:22:15 +0800
• 1ea9dd5768
  !241 编制导入 Merge pull request !241 from dxfeng/feature/dxf dxfeng 2022-09-15 10:40:41 +0000
• eb352cdca4
  Pre Merge pull request !241 from dxfeng/feature/dxf dxfeng 2022-09-15 10:40:28 +0000
• 4b3bb0d5f3 编制导入 dxfeng 2022-09-15 18:40:05 +0800
• 2457cdd2a8
  !240 编制导入 Merge pull request !240 from dxfeng/feature/dxf dxfeng 2022-09-15 10:31:50 +0000
• e25d1e3a85
  Pre Merge pull request !240 from dxfeng/feature/dxf dxfeng 2022-09-15 10:31:40 +0000
• 16fcd76468 编制导入 dxfeng 2022-09-15 18:31:11 +0800