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

• bfaa56c606 Merge pull request '分部、部门，查看、编辑接口调整' (#83) from feature/dxf into develop dxfeng 2022-12-07 11:50:49 +0800
• 37dc31b7b5 部门查看、编辑接口调整 dxfeng 2022-12-07 11:49:06 +0800
• 6fc67d7d67 分部查看、编辑接口调整 dxfeng 2022-12-07 10:36:05 +0800
• f17e8ade50 Merge pull request '分部、部门导入Excel批量新增、更新' (#82) from feature/dxf into develop dxfeng 2022-12-06 17:17:29 +0800
• 64af65cad3 部门导入新增、更新 dxfeng 2022-12-06 17:11:48 +0800
• 324881794b 分部导入新增、更新 dxfeng 2022-12-06 15:06:51 +0800
• f938abd875 Merge pull request '分部BUG修复，导入接口逻辑重写' (#81) from feature/dxf into develop dxfeng 2022-12-06 14:50:26 +0800
• 54c3676c07 分部BUG修复，导入接口逻辑重写 dxfeng 2022-12-06 14:47:50 +0800
• a5d80f4619 Merge pull request '人员卡片查看页面逻辑重写' (#80) from feature/dxf into develop dxfeng 2022-12-05 17:59:39 +0800
• b565d8c4d8 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-12-05 17:58:03 +0800
• 85ec966813 人员卡片查看页面逻辑重写 dxfeng 2022-12-05 17:57:33 +0800
• 34bab24a0c Merge pull request '分部、部门数据源调整；功能逻辑修改' (#79) from feature/dxf into develop dxfeng 2022-11-30 16:16:43 +0800
• fb17f43323 部门管理功能逻辑调整 dxfeng 2022-11-30 16:14:23 +0800
• bd33075e14 部门管理功能逻辑调整 dxfeng 2022-11-30 16:06:40 +0800
• 40a6540a1d 部门管理功能逻辑调整 dxfeng 2022-11-30 15:55:27 +0800
• dcca77774c BUG修复 20221123v1.0封版 dxfeng 2022-11-30 11:33:30 +0800
• 1c8c7ab2aa Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-29 17:05:14 +0800
• 238d8e6f75 部门接口逻辑调整 dxfeng 2022-11-29 17:00:31 +0800
• 9a2eabc8bd 部门切换数据源、实体类更新 dxfeng 2022-11-29 09:54:18 +0800
• aa3d0742ff 分部接口整理、代码优化 dxfeng 2022-11-28 11:15:54 +0800
• 665f3af816 Merge pull request '建表' (#78) from feature/cl into develop liang.cheng 2022-11-25 17:36:51 +0800
• e754d6f8fe 建表 Chengliang 2022-11-25 17:34:36 +0800
• b8b3ed2380 Merge pull request '分部列表、新增、删除、转移功能重写' (#77) from feature/dxf into develop dxfeng 2022-11-24 17:59:41 +0800
• 8c5106d06b Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-24 17:56:50 +0800
• 416471a283 分部列表、新增、删除、转移功能重写 dxfeng 2022-11-24 17:56:32 +0800
• 7ae74df165 Merge pull request 'v1.0版本封版' (#76) from feature/cl into develop liang.cheng 2022-11-23 17:13:47 +0800
• 682a98764d v1.0版本封版 Chengliang 2022-11-23 15:43:32 +0800
• fac0fcd96d Merge pull request '人员导入提示信息优化' (#75) from feature/dxf into develop dxfeng 2022-11-23 09:39:03 +0800
• 701f597f78 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-23 09:37:21 +0800
• f7758e5298 人员导入提示信息优化 dxfeng 2022-11-23 09:34:06 +0800
• 80d504aff8 Merge pull request '人员同步BUG修复，导入优化' (#74) from feature/dxf into develop dxfeng 2022-11-22 09:42:38 +0800
• 36299d3cd2 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-22 09:41:29 +0800
• 5d2b880ed5 人员同步BUG修复，导入优化 dxfeng 2022-11-22 09:41:11 +0800
• 0e97abfc9c Merge pull request '人员Mapper整合' (#73) from feature/dxf into develop dxfeng 2022-11-21 11:02:36 +0800
• ae2e5bb5a4 人员Mapper整合 dxfeng 2022-11-21 10:58:12 +0800
• 7d1fc84fad 组织架构树排序、人员卡片BUG修复 dxfeng 2022-11-18 16:28:02 +0800
• 5e950415ff Merge pull request '导入BUG，提示信息优化' (#72) from feature/dxf into develop dxfeng 2022-11-17 18:53:59 +0800
• e45ff3daa3 导入BUG，提示信息优化 dxfeng 2022-11-17 17:02:45 +0800
• 7990d67914 Merge pull request '导入BUG，提示信息优化' (#71) from feature/dxf into develop dxfeng 2022-11-17 15:42:26 +0800
• 25d3db4d81 导入BUG，提示信息优化 dxfeng 2022-11-17 15:36:26 +0800
• a89ab0cbae Merge pull request '导入BUG，提示信息优化' (#70) from feature/dxf into develop dxfeng 2022-11-17 11:38:17 +0800
• 98ed590274 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-17 11:37:07 +0800
• a273008715 导入BUG，提示信息优化 dxfeng 2022-11-17 11:36:52 +0800
• f72f6c08b1 Merge pull request '导入自动编号' (#69) from feature/dxf into develop dxfeng 2022-11-17 09:07:29 +0800
• 4b8c0c1b8b Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-17 09:06:20 +0800
• 0404c4b7fd 导入自动编号 dxfeng 2022-11-17 09:05:00 +0800
• 47c09cac9a 导入自动编号 dxfeng 2022-11-16 17:54:57 +0800
• 347632e301 Merge pull request '编制、分部树排序、人事卡片按钮权限BUG' (#68) from feature/dxf into develop dxfeng 2022-11-16 17:42:21 +0800
• 81943df058 编制、分部树排序 dxfeng 2022-11-16 17:39:58 +0800
• 197007ceb5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-16 16:17:04 +0800
• 9b20c6838a 人事卡片按钮权限BUG dxfeng 2022-11-16 16:09:32 +0800
• e130908126 Merge pull request 'BUG修复' (#67) from feature/dxf into develop dxfeng 2022-11-16 15:29:14 +0800
• 49b4358e17 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-16 15:24:34 +0800
• f9f5bc432c BUG修复 dxfeng 2022-11-16 15:23:56 +0800
• b5d5b717d1 职务导入提示优化修复20221116 ‘ml’ 2022-11-16 15:14:11 +0800
• 0315da18b1 Merge pull request 'BUG修复' (#66) from feature/dxf into develop dxfeng 2022-11-16 15:01:21 +0800
• 17f4789e33 BUG修复 dxfeng 2022-11-16 14:59:22 +0800
• 67fd2df4f9 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-16 14:58:48 +0800
• b3bfad0148 Merge pull request '“栏目表格修复”' (#65) from feature/cl into develop liang.cheng 2022-11-16 14:08:40 +0800
• cb4db723e4 “栏目表格修复” Chengliang 2022-11-16 14:06:12 +0800
• 05364f9265 BUG修复 dxfeng 2022-11-16 13:39:56 +0800
• caa9604315 职级导入异常处理方案1116 ‘ml’ 2022-11-16 11:22:28 +0800
• bb071c3ad9 Merge pull request '花名册树、角色展示、组织透视下拉框' (#64) from feature/dxf into develop dxfeng 2022-11-15 14:35:16 +0800
• 2d64a5015b 组织透视下拉框BUG dxfeng 2022-11-15 14:34:16 +0800
• 706edd43ed 职级导入提示优化1115 ‘ml’ 2022-11-15 14:24:06 +0800
• 4fc2eca27b 花名册树、角色展示BUG dxfeng 2022-11-15 11:47:54 +0800
• f8497aa3e6 Merge pull request '明细表BUG修复' (#63) from feature/dxf into develop dxfeng 2022-11-15 08:59:43 +0800
• f1a3565fc7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-15 08:56:58 +0800
• 10bb8159aa 明细表BUG修复 dxfeng 2022-11-14 19:13:35 +0800
• 0bcdbc9de8 Merge remote-tracking branch 'origin/develop' into feature/ml ‘ml’ 2022-11-14 17:30:06 +0800
• 306897c5bc 职务导入模板提示修复1114 ‘ml’ 2022-11-14 17:29:55 +0800
• 631b77826d Merge pull request '人员卡片，修改字段名' (#62) from feature/dxf into develop dxfeng 2022-11-14 14:06:26 +0800
• 7c79718d6e 人员卡片，修改字段名 dxfeng 2022-11-14 14:05:48 +0800
• 0884a88c8c Merge pull request '人员卡片，明细表展示' (#61) from feature/dxf into develop dxfeng 2022-11-14 13:58:25 +0800
• e84c3af2ac Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-14 13:56:39 +0800
• 3ec8afe78b 人员卡片，明细表展示 dxfeng 2022-11-14 13:56:19 +0800
• 2f1b1f9f2e Merge pull request 'BUG修复、卡片按钮排序' (#60) from feature/dxf into develop dxfeng 2022-11-14 11:21:03 +0800
• 7b5a4905dc BUG修复、卡片按钮排序 dxfeng 2022-11-14 11:19:08 +0800
• af6d920b59 职务导入模板生成 ‘ml’ 2022-11-11 17:31:17 +0800
• 8c7b75e471 Merge pull request '卡片按钮编辑、删除' (#59) from feature/dxf into develop dxfeng 2022-11-11 17:25:46 +0800
• 4a0ddd8adc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-11 17:24:55 +0800
• cd11f06b7f 卡片按钮新增、删除 dxfeng 2022-11-11 17:24:22 +0800
• 37b09954c6 Merge pull request 'develop' (#58) from develop into master liang.cheng 2022-11-11 17:19:07 +0800
• 05ecd651ad Merge pull request 'develop' (#57) from develop into release release liang.cheng 2022-11-11 17:16:44 +0800
• c9b82b5f71 Merge pull request 'bug修复' (#56) from feature/cl into develop liang.cheng 2022-11-11 16:55:29 +0800
• d236127f31 bug修复 Chengliang 2022-11-11 16:52:01 +0800
• 091f202eac 职务导入 ‘ml’ 2022-11-11 16:50:35 +0800
• 33c02ec78e 组织架构图、集团负责人展示 dxfeng 2022-11-11 16:34:36 +0800
• 16794bf98c 人员卡片按钮保存 dxfeng 2022-11-11 16:24:26 +0800
• 4e915f272b Merge pull request 'sql' (#55) from feature/cl into develop liang.cheng 2022-11-11 15:28:37 +0800
• 2bf63c689e sql Chengliang 2022-11-11 15:22:41 +0800
• 7c5d6bfa19 Merge pull request '人员卡片按钮自定义' (#54) from feature/dxf into develop dxfeng 2022-11-11 14:12:52 +0800
• 854a40b7cd 人员卡片按钮自定义 dxfeng 2022-11-11 14:11:34 +0800
• afc54c6d1e Merge pull request '人员卡片按钮自定义' (#53) from feature/dxf into develop dxfeng 2022-11-11 14:01:41 +0800
• b7217dae23 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf dxfeng 2022-11-11 14:00:08 +0800
• d16f13405c 人员卡片按钮自定义 dxfeng 2022-11-11 13:59:45 +0800
• 1baf55e04f 职级职等导入更新 ‘ml’ 2022-11-11 13:35:00 +0800
• 33fe824cae Merge remote-tracking branch 'origin/develop' into feature/ml ‘ml’ 2022-11-11 10:37:10 +0800
• 9517ad15d6 优化职级模板字段顺序 ‘ml’ 2022-11-11 10:36:49 +0800
• 003dd59cea Merge pull request 'sql增加' (#52) from feature/cl into develop liang.cheng 2022-11-11 09:17:38 +0800