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

• 31a26dec08 部门合并、转移。岗位同步BUG修复 dxfeng 2022-12-20 13:53:18 +0800
• b8158cdcec oracle版数据同步问题 Mlin 2022-12-20 10:57:46 +0800
• 865e810b4c Merge pull request 'BUG修复' (#107) from feature/dxf into develop dxfeng 2022-12-20 09:30:32 +0800
• ebf7a1bdda Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-20 09:28:39 +0800
• e7cc13ed60 BUG修复 dxfeng 2022-12-20 09:13:11 +0800
• 30898d0eee oracle环境存入版本bug修复、新增职等职级1220 Mlin 2022-12-20 09:02:51 +0800
• 0128de79ea oracle环境存入版本bug修复、新增职等职级1219 Mlin 2022-12-19 19:24:28 +0800
• dddc427066 Merge pull request 'BUG修复' (#106) from feature/dxf into develop dxfeng 2022-12-19 16:05:03 +0800
• a7a0966e23 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-19 16:03:50 +0800
• 2b0c1d0a69 BUG修复 dxfeng 2022-12-19 16:00:47 +0800
• f2f222530b Merge pull request 'Oracle版本BUG修复' (#105) from feature/dxf into develop dxfeng 2022-12-19 11:35:36 +0800
• d21d3148bf Oracle版本BUG修复 dxfeng 2022-12-19 11:34:53 +0800
• 5bcd3e22fc oracle环境存入版本bug修复1219 Mlin 2022-12-19 08:44:37 +0800
• 806d18e511 Merge remote-tracking branch 'origin/develop' into feature/ml Mlin 2022-12-16 18:32:18 +0800
• a5cc902c10 oracle环境存入版本bug修复 Mlin 2022-12-16 18:31:50 +0800
• ecbd5c0ca3 Merge pull request 'BUG修复' (#104) from feature/dxf into develop dxfeng 2022-12-16 18:29:56 +0800
• b11251701a BUG修复 dxfeng 2022-12-16 18:29:12 +0800
• afe4813427 Merge remote-tracking branch 'origin/develop' into feature/ml Mlin 2022-12-16 16:39:28 +0800
• 78d08ea740 无历史版本返回为空 Mlin 2022-12-16 16:39:09 +0800
• a35bb7716e Merge pull request 'BUG修复' (#103) from feature/dxf into develop dxfeng 2022-12-16 16:32:22 +0800
• c86e37495d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-16 16:26:01 +0800
• b9cfe839e7 BUG修复 dxfeng 2022-12-16 16:21:54 +0800
• 78dfc87f61 同步数据接口 Mlin 2022-12-16 15:58:20 +0800
• 0b89abeaac Merge remote-tracking branch 'origin/develop' into feature/ml Mlin 2022-12-16 14:25:48 +0800
• 981ea3ad4a 存为版本取消存入map表，同步接口 Mlin 2022-12-16 14:25:30 +0800
• 70f0cfcc9c Merge pull request '根据职等职级字段，补充人员信息' (#102) from feature/dxf into develop dxfeng 2022-12-16 14:25:26 +0800
• 659261245d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-16 14:24:58 +0800
• 434dbacb64 根据职等职级字段，补充人员信息 dxfeng 2022-12-16 14:24:40 +0800
• 66e1c77e3b Merge pull request '根据职等职级字段，补充人员信息' (#101) from feature/dxf into develop dxfeng 2022-12-16 13:57:39 +0800
• ebe5003df9 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-16 13:54:03 +0800
• f428dff5a0 根据职等职级字段，补充人员信息 dxfeng 2022-12-16 13:53:47 +0800
• b59f3a9d9f 定时任务刷新在岗数bug修复 Mlin 2022-12-16 10:13:52 +0800
• 8cda66dc8b bug修复 Mlin 2022-12-15 20:29:58 +0800
• 241bf47710 Merge remote-tracking branch 'origin/develop' into feature/ml Mlin 2022-12-15 19:52:04 +0800
• 184a9e375f 版本查询接口二版 Mlin 2022-12-15 19:51:04 +0800
• afa66c74c1 Merge pull request '岗位刷新功能' (#100) from feature/cl into develop liang.cheng 2022-12-15 18:58:33 +0800
• 95d53a6d8c Merge remote-tracking branch 'origin/develop' into feature/ml Mlin 2022-12-15 18:57:44 +0800
• faaed265fe 版本查询接口初版 Mlin 2022-12-15 18:57:32 +0800
• 4105600770 岗位刷新功能 Chengliang 2022-12-15 18:56:25 +0800
• d439dc8944 Merge pull request '岗位增加刷新按钮' (#99) from feature/cl into develop liang.cheng 2022-12-15 17:04:15 +0800
• 4d8948724e 岗位增加刷新按钮 Chengliang 2022-12-15 16:58:02 +0800
• e26e780310 Merge pull request 'BUG修复' (#98) from feature/dxf into develop dxfeng 2022-12-15 16:57:09 +0800
• 1db4a85d46 BUG修复 dxfeng 2022-12-15 16:13:21 +0800
• 569a3132c1 分部、部门、人员封存后取消架构图展示 Mlin 2022-12-15 15:16:40 +0800
• 3be6bf11a2 Merge remote-tracking branch 'origin/develop' into feature/ml Mlin 2022-12-15 14:39:06 +0800
• b3057e2f4e 版本查询接口 Mlin 2022-12-15 14:38:48 +0800
• 84a5fc3879 Merge pull request 'BUG修复' (#97) from feature/dxf into develop dxfeng 2022-12-15 10:02:27 +0800
• 3462511603 showOrder类型小数转换 Mlin 2022-12-15 09:59:57 +0800
• 550be7fb14 BUG修复 dxfeng 2022-12-15 09:49:55 +0800
• 7f51135424 定时任务 Mlin 2022-12-14 17:42:59 +0800
• 94690cbd86 定时任务 Mlin 2022-12-14 17:42:23 +0800
• f0c02597a8 Merge pull request 'BUG修复' (#96) from feature/dxf into develop dxfeng 2022-12-14 15:40:01 +0800
• 42545745fe Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-14 15:38:59 +0800
• 946354b32d BUG修复 dxfeng 2022-12-14 15:38:29 +0800
• 1db1949a94 Merge remote-tracking branch 'origin/develop' into feature/ml Mlin 2022-12-14 14:32:40 +0800
• 43f00f7d9d sqlserver存入版本修复、定时任务 Mlin 2022-12-14 14:32:19 +0800
• bee48accdd Merge pull request 'BUG修复' (#95) from feature/dxf into develop dxfeng 2022-12-14 10:59:02 +0800
• d2f6fa693a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-14 10:58:09 +0800
• 4117a34928 BUG修复 dxfeng 2022-12-14 10:52:20 +0800
• 8383c08a06 BUG修复 dxfeng 2022-12-13 18:19:12 +0800
• 9c80a74386 oracle、sqlserver查询版本语句(部门存入失败) Mlin 2022-12-13 16:38:06 +0800
• 1f9c632f0b Merge pull request '分权功能版本回退，岗位BUG修复' (#94) from feature/dxf into develop dxfeng 2022-12-13 16:01:53 +0800
• b9d06b4246 分权功能版本回退，岗位BUG修复 dxfeng 2022-12-13 15:57:21 +0800
• 5897ae1563 Merge remote-tracking branch 'origin/develop' into feature/ml Mlin 2022-12-13 15:01:11 +0800
• e81d8f4939 oracle、sqlserver查询版本语句 Mlin 2022-12-13 14:58:22 +0800
• 2832a8ff46 Merge pull request '分权功能重构，调用EC方法' (#93) from feature/dxf into develop dxfeng 2022-12-13 11:00:07 +0800
• fab4614cd5 分权功能重构，调用EC方法 dxfeng 2022-12-13 10:58:57 +0800
• 63e2d1238f Merge pull request '分权功能重构、改造' (#92) from feature/dxf into develop dxfeng 2022-12-13 10:48:22 +0800
• ce2c34cfdd BUG修复,岗位关联关系调整 dxfeng 2022-12-13 10:42:35 +0800
• 837a237ffc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-13 09:01:22 +0800
• c0ba7fb361 Merge pull request 'BUG修复,岗位关联关系调整' (#91) from feature/dxf into develop dxfeng 2022-12-12 18:13:24 +0800
• 32fd42db2f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-12 18:11:59 +0800
• b64f15bd83 BUG修复,岗位关联关系调整 dxfeng 2022-12-12 18:11:03 +0800
• 2b549bcc4a 人员版本控制写入逻辑 Mlin 2022-12-12 17:55:50 +0800
• 57cbf3db8b Merge pull request 'BUG修复,岗位关联关系调整' (#90) from feature/dxf into develop dxfeng 2022-12-09 17:07:33 +0800
• 6169b007ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-09 17:05:01 +0800
• 32e8eb4890 分部、部门版本控制写入逻辑 Mlin 2022-12-09 16:57:42 +0800
• 1bdc7e2fa4 Merge remote-tracking branch 'origin/develop' into feature/ml Mlin 2022-12-09 16:04:50 +0800
• 13ae136872 部门版本控制写入逻辑 Mlin 2022-12-09 16:04:35 +0800
• 45a24cb0be BUG修复,岗位关联关系调整 dxfeng 2022-12-09 15:39:15 +0800
• 06c9912d21 BUG修复,岗位关联关系调整 dxfeng 2022-12-09 15:07:34 +0800
• 6d2b452354 Merge pull request 'BUG修复、岗位关联关系调整' (#89) from feature/dxf into develop dxfeng 2022-12-09 14:32:19 +0800
• b20e473211 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-09 14:30:30 +0800
• dee6bb25b5 岗位关联关系调整 dxfeng 2022-12-09 14:29:56 +0800
• 3470ba04cd 岗位关联关系调整 dxfeng 2022-12-09 14:29:20 +0800
• 73dbaf75ac 分部版本控制写入逻辑 Mlin 2022-12-09 08:50:23 +0800
• b368c3ea27 BUG修复 dxfeng 2022-12-08 17:10:50 +0800
• c1c812596d BUG修复 dxfeng 2022-12-08 17:10:31 +0800
• eaa1c53c9c 分部、部门联调。BUG修复 dxfeng 2022-12-08 14:37:48 +0800
• 6949775979 Merge pull request 'BUG修复' (#88) from feature/dxf into develop dxfeng 2022-12-08 14:17:54 +0800
• f89ebdb965 分部、部门联调。BUG修复 dxfeng 2022-12-08 14:16:58 +0800
• a1f2c9d1ac BUG修复 dxfeng 2022-12-08 11:24:48 +0800
• ea8a48099f Merge pull request '人员导入逻辑重写' (#87) from feature/dxf into develop dxfeng 2022-12-08 11:04:35 +0800
• 668231fd61 人员导入逻辑重写 dxfeng 2022-12-08 11:01:30 +0800
• 7ec2f0e56e Merge pull request '版本管理' (#86) from feature/cl into develop liang.cheng 2022-12-08 10:00:15 +0800
• d345a5fe66 版本管理 Chengliang 2022-12-08 09:56:25 +0800
• 990f4de8c4 Merge pull request '部门列表BUG修复' (#85) from feature/dxf into develop dxfeng 2022-12-07 14:17:41 +0800
• de03ca3b8b 部门列表BUG修复 dxfeng 2022-12-07 14:15:02 +0800
• 032eb26cee Merge pull request '部门列表BUG修复' (#84) from feature/dxf into develop dxfeng 2022-12-07 14:08:55 +0800
• 3477539393 部门列表BUG修复 dxfeng 2022-12-07 14:08:03 +0800