Commits · 8fbf7b01c335b859d6658db71dca78e606102add · 8timerv2 / 8timerapiv200

24 Apr, 2020 2 commits
- Merge branch 'wdz' into 'develop' · 8fbf7b01
```
早上起来拉一下develop，debug一下

See merge request 8timerv2/8timerapiv200!43
```
  Administrator committed Apr 24, 2020
  8fbf7b01 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 396b202f
  东州翁 committed Apr 24, 2020
  
  396b202f Browse Files
23 Apr, 2020 7 commits
- Merge branch 'wdz' into 'develop' · 890d7b22
```
应前端需求加个未认证状态

See merge request 8timerv2/8timerapiv200!42
```
  Administrator committed Apr 23, 2020
  890d7b22 Browse Files
- 应前端需求加个未认证状态 · d70e14d9
  东州翁 committed Apr 23, 2020
  
  d70e14d9 Browse Files
- Merge branch 'wdz' into 'develop' · 37601696
```
Wdz

See merge request 8timerv2/8timerapiv200!41
```
  Administrator committed Apr 23, 2020
  37601696 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 17db9816
  东州翁 committed Apr 23, 2020
  
  17db9816 Browse Files
- 新增默认发票资料接口 · c1fbcd0e
  东州翁 committed Apr 23, 2020
  
  c1fbcd0e Browse Files
- Merge branch 'tzq' into 'develop' · 9e8a7094
```
审批人审批,热部署关闭（启动会导致 反序列化 转换 对象出错）

See merge request 8timerv2/8timerapiv200!40
```
  Administrator committed Apr 23, 2020
  9e8a7094 Browse Files
- 审批人审批,热部署关闭（启动会导致反序列化转换对象出错） · 11f85462
  tangzhaoqian committed Apr 23, 2020
  
  11f85462 Browse Files
22 Apr, 2020 3 commits
- 简化了籍贯的展示籍贯/展示所有籍贯接口，企业信息添加了新字段，修改了以前的修改企业信息和认证申请接口 · 69026415
  东州翁 committed Apr 22, 2020
  
  69026415 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 3adcd720
  东州翁 committed Apr 22, 2020
  
  3adcd720 Browse Files
- 小范围修改 · 64f96c15
  东州翁 committed Apr 22, 2020
  
  64f96c15 Browse Files
21 Apr, 2020 11 commits
- Merge branch 'tzq' into 'develop' · 4d8412dd
```
Tzq

See merge request 8timerv2/8timerapiv200!39
```
  Administrator committed Apr 21, 2020
  4d8412dd Browse Files
- 提交 · c5dd34a9
  tangzhaoqian committed Apr 21, 2020
  
  c5dd34a9 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into tzq · 8d650af8
  tangzhaoqian committed Apr 21, 2020
  
  8d650af8 Browse Files
- 发起审批,审批汇总,审批详情,mybatisplus升级(字段默认值自动补全功能),流程节点解析优化 · cde5e83f
  tangzhaoqian committed Apr 21, 2020
  
  cde5e83f Browse Files
- Merge branch 'dsc' into 'develop' · 2a5b8754
```
企业中心实体类及持久层接口-付费模块表，付费内容表，购买记录表，开票资料表，套餐余量表，使用记录表，使用场景枚举类

See merge request 8timerv2/8timerapiv200!38
```
  dengshichuan committed Apr 21, 2020
  2a5b8754 Browse Files
- 企业中心实体类及持久层接口-付费模块表，付费内容表，购买记录表，开票资料表，套餐余量表，使用记录表，使用场景枚举类 · 83ce4d02
  邓实川 committed Apr 21, 2020
  
  83ce4d02 Browse Files
- Merge branch 'dsc' into 'develop' · 30a8fedc
```
bug提交

See merge request 8timerv2/8timerapiv200!37
```
  dengshichuan committed Apr 21, 2020
  30a8fedc Browse Files
- bug提交 · bf455a93
  邓实川 committed Apr 21, 2020
  
  bf455a93 Browse Files
- Merge branch 'wdz' into 'develop' · 0ff6c96f
```
Wdz

See merge request 8timerv2/8timerapiv200!36
```
  Administrator committed Apr 21, 2020
  0ff6c96f Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 437addff
  东州翁 committed Apr 21, 2020
  
  437addff Browse Files
- 1.新增意见反馈接口 2.修改了验证码认证代码中的字段类型，3.添加意见反馈所需表 · 5edaa44a
  东州翁 committed Apr 21, 2020
  
  5edaa44a Browse Files
20 Apr, 2020 6 commits
- Merge branch 'dsc' into 'develop' · 3f4f75e7
```
Dsc

See merge request 8timerv2/8timerapiv200!35
```
  dengshichuan committed Apr 20, 2020
  3f4f75e7 Browse Files
- 动态定时任务优化 · 71cdf363
  邓实川 committed Apr 20, 2020
  
  71cdf363 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · c9481cef
  邓实川 committed Apr 20, 2020
  
  c9481cef Browse Files
- Merge branch 'tzq' into 'develop' · f656c582
```
审批bug修复

See merge request 8timerv2/8timerapiv200!34
```
  dengshichuan committed Apr 20, 2020
  f656c582 Browse Files
- 审批bug修复 · 979bd18d
  tangzhaoqian committed Apr 20, 2020
  
  979bd18d Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · 4addc076
  邓实川 committed Apr 20, 2020
  
  4addc076 Browse Files
19 Apr, 2020 1 commit

Merge branch 'tzq' into 'develop' · a6bd4b3c

审批模块:审批模块重构，审批模块数据库设计。审批模板，自定义审批，可见审批发起人，增删查改相关功能完成，

See merge request 8timerv2/8timerapiv200!33

committed Apr 19, 2020

a6bd4b3c Browse Files

18 Apr, 2020 4 commits
- 审批模块:审批模块重构，审批模块数据库设计。审批模板，自定义审批，可见审批发起人，增删查改相关功能完成， · f9abea5d
  tangzhaoqian committed Apr 18, 2020
  
  f9abea5d Browse Files
- 优化一下项目结构 · b6af61fb
  邓实川 committed Apr 18, 2020
  
  b6af61fb Browse Files
- Merge branch 'dsc' into 'develop' · a4a6a76a
```
maven仓库优化，测试

See merge request 8timerv2/8timerapiv200!32
```
  dengshichuan committed Apr 18, 2020
  a4a6a76a Browse Files
- maven仓库优化，测试 · b2f3b14d
  邓实川 committed Apr 18, 2020
  
  b2f3b14d Browse Files
17 Apr, 2020 6 commits
- Merge branch 'dsc' into 'develop' · 8fec6aaa
```
Spring Boot actuator监控

See merge request 8timerv2/8timerapiv200!31
```
  dengshichuan committed Apr 17, 2020
  8fec6aaa Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · b9de4438
  邓实川 committed Apr 17, 2020
  
  b9de4438 Browse Files
- SpringBoot actuator 监控 · 9b7c838b
  邓实川 committed Apr 17, 2020
  
  9b7c838b Browse Files
- Merge branch 'wdz' into 'develop' · ae9745bb
```
Wdz

See merge request 8timerv2/8timerapiv200!30
```
  dengshichuan committed Apr 17, 2020
  ae9745bb Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 8d3a7fc6
```
# Conflicts:
#	src/main/java/cn/timer/api/controller/zzgl/ZzglController.java
```
  东州翁 committed Apr 17, 2020
  8d3a7fc6 Browse Files
- 1.应前端更新了正式，试用字段顺序 2.根据审批要求写了一个修改，删除员工部门的方法用于调岗离职 3.写了一个正则的验证字符串工具类。 · 8070bfa4
  东州翁 committed Apr 17, 2020
  
  8070bfa4 Browse Files