Commit Graph

Select branches

Hide Pull Requests

master

#1

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#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

#19

#19

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#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

#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

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#287

#287

#288

#288

#289

#289

#29

#29

#290

#290

#291

#291

#292

#292

#293

#293

#294

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#3

#30

#30

#300

#300

#301

#301

#302

#302

#303

#303

#304

#304

#305

#305

#306

#306

#307

#307

#308

#308

#309

#309

#31

#31

#310

#310

#311

#311

#312

#312

#313

#313

#314

#314

#315

#315

#316

#316

#317

#317

#318

#318

#319

#319

#32

#32

#320

#320

#321

#321

#322

#322

#323

#323

#324

#324

#325

#325

#326

#326

#327

#327

#328

#328

#329

#329

#33

#33

#330

#330

#331

#331

#332

#332

#333

#333

#334

#334

#335

#335

#336

#336

#337

#337

#338

#338

#339

#339

#34

#34

#340

#340

#341

#341

#342

#342

#343

#343

#344

#344

#345

#345

#346

#346

#347

#347

#348

#349

#349

#35

#35

#350

#350

#351

#351

#352

#352

#353

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#36

#360

#360

#361

#361

#362

#362

#363

#363

#364

#364

#365

#365

#366

#366

#367

#367

#368

#368

#369

#369

#37

#37

#370

#370

#371

#371

#372

#372

#373

#373

#374

#375

#375

#376

#376

#377

#377

#378

#378

#379

#379

#38

#38

#380

#380

#381

#381

#382

#382

#383

#383

#384

#384

#385

#385

#386

#386

#387

#387

#388

#388

#389

#389

#39

#39

#390

#391

#392

#392

#393

#393

#394

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#40

#40

#400

#400

#401

#401

#402

#402

#403

#403

#404

#404

#405

#405

#406

#406

#407

#407

#408

#408

#409

#409

#41

#41

#410

#410

#411

#411

#412

#412

#413

#413

#414

#414

#415

#415

#416

#416

#417

#417

#418

#418

#419

#419

#42

#42

#420

#420

#421

#421

#422

#422

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#43

#430

#430

#431

#431

#432

#432

#433

#433

#434

#434

#435

#435

#436

#436

#437

#437

#438

#438

#439

#439

#44

#44

#440

#440

#441

#441

#442

#442

#443

#443

#444

#444

#445

#445

#446

#446

#447

#448

#448

#449

#449

#45

#45

#450

#450

#451

#451

#452

#452

#453

#453

#454

#454

#455

#455

#456

#456

#457

#457

#458

#458

#459

#459

#46

#46

#460

#460

#461

#461

#462

#462

#463

#463

#464

#464

#465

#465

#466

#466

#467

#467

#468

#468

#469

#469

#47

#47

#470

#470

#471

#471

#472

#472

#473

#473

#474

#474

#475

#475

#476

#476

#477

#477

#478

#478

#479

#479

#48

#48

#480

#480

#481

#481

#482

#482

#483

#483

#484

#484

#485

#485

#486

#486

#487

#487

#488

#488

#489

#489

#49

#49

#490

#490

#491

#491

#492

#492

#493

#493

#494

#494

#495

#495

#496

#496

#497

#497

#498

#498

#499

#499

#5

#50

#50

#500

#500

#501

#501

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#742939

#75

#75

#76

#76

#77

#77

#78

#78

#780139

#786641

#788658

#788913

#79

#79

#791045

#791183

#794411

#8

#80

#80

#801369

#802025

#81

#81

#82

#82

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#98

#99

#99

v2.2

v2.3

v2.4

v3.0

v3.1

v3.2

v3.3

v3.4

v4.0

v4.1

v4.2

v4.3

v4.3.1

v4.4

v4.5.0

v4.5.1

v4.6.0

v4.6.1

v4.6.2

v4.7.0

v4.7.1

v4.7.2

v4.7.3

v4.7.4

v4.7.5

v4.7.6

v4.7.7

v4.7.8

v4.7.9

Mono Color

• 8196b445ec !31 同步 Merge pull request !31 from Bo/bo_dev Bo 2021-08-18 02:31:47 +0000
• c8b691eb96 Merge branch 'dev' of gitee.com:septemyang/RuoYi into bo_dev Bo 2021-08-18 02:31:05 +0000
• f62b9a07e9 清除git缓存，解决增加.gitignore不生效的问题。 Bo 2021-08-17 22:07:29 +0800
• 5ce0b8a9dc update .gitignore Bo 2021-08-17 22:03:26 +0800
• 98569c6e8a 1 Bo 2021-08-17 21:44:26 +0800
• 4dfb0c680a 1 Bo 2021-08-17 21:43:44 +0800
• 003eaa996a 修改maven打包名为it_war Bo 2021-08-17 21:35:30 +0800
• 020c737345 修改maven打包名为it_war Bo 2021-08-17 21:21:43 +0800
• 2756d1b2bd 修改maven打包名为it_war Bo 2021-08-17 21:15:46 +0800
• 264d3e7fa2 修改maven打包名为it_war Bo 2021-08-17 21:14:01 +0800
• e9bd08c737 Merge branch 'master' of gitee.com:y_project/RuoYi monozuki62 2021-08-16 22:29:37 +0800
• 8cd8625f71 针对点击导航栏，刷新页面的动作做了一点补充。 在菜单配置中添加了【仅刷新列表】的选项 允许用户只刷新页面中的table和treeTable 为菜单选择【仅刷新列表】后，可以避免因为点击导航栏失去检索栏的输入，或者已经填入的form信息。 monozuki62 2021-08-16 21:42:05 +0800
• c0e48b45c8 logback.xml修改路径 18326186802 2021-08-16 18:43:46 +0800
• 274e77fbba kettle优化 18326186802 2021-08-16 18:18:03 +0800
• c0cb2e1447 !30 排除application-druid.yml同步 Merge pull request !30 from Bo/bo_dev Bo 2021-08-16 11:10:43 +0000
• 4e69226d71 排除application-druid.yml同步 Bo 2021-08-16 19:07:21 +0800
• d70ee32896 logback.xml修改路径 18326186802 2021-08-16 18:43:46 +0800
• 208c8b35eb Merge branch 'kone_dev' into dev 18326186802 2021-08-16 18:19:43 +0800
• 863c66c140 kettle优化 18326186802 2021-08-16 18:18:03 +0800
• 52e52b642a !28 同步Ruoyi更新调整快递相关查询排序 Merge pull request !28 from Bo/bo_dev Bo 2021-08-16 10:10:59 +0000
• 29157e8387 调整快递相关查询排序 Bo 2021-08-16 18:05:59 +0800
• 75f780a021 !27 同步RuoYi更新 Merge pull request !27 from Bo/master Bo 2021-08-16 08:42:08 +0000
• 1c2bbd91b2 Merge branch 'bo_dev' of gitee.com:septemyang/RuoYi into master Bo 2021-08-16 08:41:45 +0000
• aac0ba1791 Excel导入查询快递，增加客服人员，送货客户 Bo 2021-08-16 15:51:54 +0800
• 2796a96872 优化异常信息 RuoYi 2021-08-16 15:13:04 +0800
• 51a5cc65c7 修正方法名单词拼写错误 RuoYi 2021-08-16 10:30:15 +0800
• 84c4968b06 !26 实例演示只让admin可见 Merge pull request !26 from Bo/dev Bo 2021-08-15 13:04:58 +0000
• f90e82224d 只让admin账号可见实例演示， Bo 2021-08-15 20:58:06 +0800
• 5e1ea95c8f !24 增加TOPGP签收后返回接口 Merge pull request !24 from Bo/bo_dev Bo 2021-08-15 12:02:23 +0000
• 2d5f955aeb 统一快递单号，出货单号命名为(expressNum,deliveryNum) Bo 2021-08-15 20:00:06 +0800
• 7cd3135e54 增加TOPGP签收后返回接口 Bo 2021-08-15 19:43:52 +0800
• 24ce46c525 将Gson改为使用fastjson,与若依保持一致。 Bo 2021-08-14 21:13:54 +0800
• 8f458c61d8 解决同步更新Ruoyi冲突问题 Bo 2021-08-13 22:16:36 +0800
• 0f088d2e82 !23 更新 Merge pull request !23 from Bo/bo_dev Bo 2021-08-13 11:41:13 +0000
• a6ae06dc31 Merge branch 'dev' of gitee.com:septemyang/RuoYi into bo_dev Bo 2021-08-13 11:40:36 +0000
• 0ec7cce347 同步Ruoyi更新后，ExcelUtil.java中String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();报错，暂时Mark掉 Bo 2021-08-13 19:37:51 +0800
• 57ccaf3eb5 !22 同步RuoYi更新 Merge pull request !22 from Bo/master Bo 2021-08-13 10:28:16 +0000
• 78043a51db Merge branch 'bo_dev' of gitee.com:septemyang/RuoYi into master Bo 2021-08-13 10:27:54 +0000
• d9c6a862c2 增加TOPGP订阅快递及推送日志功能 修复根据快递单号获取快递公司编号问题 Bo 2021-08-13 17:29:01 +0800
• e42481d016 Pre Merge pull request !323 from 蒋正午/N/A 蒋正午 2021-08-13 05:02:45 +0000
• 3cb31eea90 ttt 蒋正午 2021-08-13 05:02:45 +0000
• 184cc11d1c Excel注解图片导入兼容xls RuoYi 2021-08-13 10:49:19 +0800
• 5ca33901c5 补充遗漏的@Override注解 RuoYi 2021-08-13 10:16:33 +0800
• fdacd1b4ab 增加关闭redis池资源 18326186802 2021-08-13 09:29:59 +0800
• 4ec04eda71 定时任务支持在线生成cron表达式 RuoYi 2021-08-12 16:29:50 +0800
• 2da88e0656 Merge branch 'dev' into kone_dev 18326186802 2021-08-12 14:06:58 +0800
• 2c6ac7ebf9 Merge branch 'dev' of https://gitee.com/septemyang/RuoYi into dev 18326186802 2021-08-12 14:06:09 +0800
• 2ffac19596 kettleV2.0.1:增加队列.增加状态和最后成功时间 18326186802 2021-08-12 14:05:23 +0800
• e39f8f9127 Excel注解支持Image图片导入 RuoYi 2021-08-11 09:35:05 +0800
• f34cd1d9b8 !321 update ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java. Merge pull request !321 from Hacker/N/A 若依 2021-08-11 01:31:57 +0000
• 95a86453d8 同浏览器中 防止不同用户登录时后者覆盖前者的sessionid fenglangjie 2021-08-10 18:47:13 +0800
• 330f7eca9b TOPGP订阅快递及推送 Bo 2021-08-10 15:53:53 +0800
• a22f446b28 TOPGP订阅快递及推送 Bo 2021-08-10 15:53:45 +0800
• d83a444865 Pre Merge pull request !321 from Hacker/N/A Hacker 2021-08-10 03:40:42 +0000
• 3bf25cc829 update ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java. Hacker 2021-08-10 03:40:35 +0000
• 0606663fe8 支持配置是否开启记住我功能 RuoYi 2021-08-10 11:39:17 +0800
• 89719f0570 !320 update ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java. Merge pull request !320 from Hacker/N/A 若依 2021-08-10 03:32:24 +0000
• 6acfb0d5d9 !319 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java. Merge pull request !319 from Hacker/N/A 若依 2021-08-10 03:32:08 +0000
• b9122a1d15 Pre Merge pull request !320 from Hacker/N/A Hacker 2021-08-10 02:48:51 +0000
• 3f874d04ed update ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java. Hacker 2021-08-10 02:48:50 +0000
• d3b3fcf55b Pre Merge pull request !319 from Hacker/N/A Hacker 2021-08-09 09:38:05 +0000
• fba8008c81 移动端进入首页设置默认样式 RuoYi 2021-08-09 17:36:40 +0800
• e8782ab4bf update ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java. Hacker 2021-08-09 08:10:26 +0000
• 62ece10f60 Merge branch 'dev' of https://gitee.com/septemyang/RuoYi into kone_dev 18326186802 2021-08-09 13:43:48 +0800
• ed9277506d poi版本降低.加入redis队列 18326186802 2021-08-09 13:43:36 +0800
• be45eadf5c !21 同步 Merge pull request !21 from Bo/dev Bo 2021-08-09 03:54:06 +0000
• 051a7695da 新增访问Topgp Webservice接口Demo Bo 2021-08-09 11:50:32 +0800
• dfe9c1a75b !20 新增访问TOPGP WebService接口 Merge pull request !20 from Bo/bo_dev Bo 2021-08-09 02:42:15 +0000
• 2723b5cd14 新增访问Topgp Webservice接口Demo Bo 2021-08-09 10:29:30 +0800
• 4142a733b8 升级bootstrap-fileinput到最新版本5.2.3 RuoYi 2021-08-08 16:48:42 +0800
• 3601972228 update bin RuoYi 2021-08-08 16:48:26 +0800
• 69d476e628 修正快递查询 Bo 2021-08-07 22:28:47 +0800
• a81ca0a5bb 计入队列执行任务 18326186802 2021-08-06 16:07:43 +0800
• ef41439260 优化用户不能删除自己 RuoYi 2021-08-06 13:25:11 +0800
• e037173e14 提取通用方法到基类控制器 RuoYi 2021-08-06 13:23:38 +0800
• a87b1c93c0 默认开始/结束时间绑定控件选择类型 RuoYi 2021-08-06 13:16:02 +0800
• e92d6c4a65 Pre Merge pull request !318 from panace/master panace 2021-08-05 01:15:32 +0000
• d8f0bdfa7a 增加向指定 Restful接口 发送POST方法的请求的方法 panace 2021-08-05 09:14:22 +0800
• 0d73c449f8 Pre Merge pull request !317 from panace/master panace 2021-08-05 01:09:52 +0000
• 321f8633be 增加向指定 Restful接口 发送POST方法的请求的方法 bo.yang 2021-08-05 09:08:22 +0800
• d988461a73 增加向指定 Restful接口 发送POST方法的请求的方法 bo.yang 2021-08-05 09:03:22 +0800
• 32cfb2e70b 删除文件 sql/ruoyi.pdm panace 2021-08-04 23:03:42 +0000
• 83bce07713 快递100授权信息，改到yml bo.yang 2021-08-04 20:30:37 +0800
• e44e212af5 集成Jwt登录，支持TOPGP访问接口 Swagger文档完善（快递、帆软、TOPGP访问) bo.yang 2021-08-04 17:33:15 +0800
• 4d4a937d45 Pre Merge pull request !316 from Bo/bo_dev Bo 2021-08-04 09:02:45 +0000
• d5dcc8285d 集成Jwt登录，支持TOPGP访问接口 Swagger文档完善（快递、帆软、TOPGP访问) bo.yang 2021-08-04 16:59:22 +0800
• 36db7fa387 增加接受Topgp订阅快递请求处理方法 bo.yang 2021-08-03 09:12:51 +0800
• faf8fa55a9 Merge branch 'dev' of https://gitee.com/septemyang/RuoYi into bo_dev bo.yang 2021-08-02 12:00:16 +0800
• bfc8da132e !19 bo_dev更新 Merge pull request !19 from Bo/bo_dev Bo 2021-08-02 03:59:58 +0000
• c8cc702b59 Merge branch 'dev' of https://gitee.com/septemyang/RuoYi into bo_dev bo.yang 2021-08-02 11:57:06 +0800
• 1b58ebf2e8 1、调整默认头像 2、如果用户状态为02（从OA同步），人员在职状态也不能做变更 bo.yang 2021-08-02 11:56:30 +0800
• 3af444c6d5 !18 同步bo_dev Merge pull request !18 from Bo/bo_dev Bo 2021-08-01 17:02:30 +0000
• 188a53bf7f 1、调整同步OA人员、部门的逻辑 2、人员同步保留系统原有头像，密码等信息 3、当部门参设置为从OA同步时，隐藏新增、编辑、删除按钮。 bo.yang 2021-08-02 00:58:21 +0800
• 724a242f7a !17 企业微信Toke改为存放到EHCache Merge pull request !17 from Bo/bo_dev Bo 2021-07-31 16:31:40 +0000
• 934b2854aa 获取企业微信Token由存放到数据库，改为存放到EHCache缓存。 bo.yang 2021-08-01 00:29:14 +0800
• 3f46f3d6d2 !16 同步RuoYi更新 Merge pull request !16 from Bo/master Bo 2021-07-31 10:31:48 +0000
• a21aae4b28 Pre Merge pull request !315 from Bo/master Bo 2021-07-31 10:11:34 +0000
• 2c828e5cec 解决启动WARN警告： Unable to interpret the implicit parameter configuration 这是因为Swagger中的注解@ApiImplicitParam有一个属性为dataTypeClass，该属性的默认值为Void.class，因为没有指定dataTypeClass属性的值，所以报该警告信息。 bo.yang 2021-07-31 18:09:27 +0800
• f26544b2fe Pre Merge pull request !312 from lixifun/#I42DBV_日志目录配置读取application.yml中配置 lixifun 2021-07-31 09:45:23 +0000
• 0247a2d965 富文本默认dialogsInBody属性 RuoYi 2021-07-31 17:44:11 +0800