vayne
|
1aa6de45f0
|
计量管理
|
2 months ago |
jiyufei
|
412651bfed
|
feat(front):车辆管理问题修复;
|
3 months ago |
vayne
|
27fbd39c6d
|
Merge branch 'master' of http://222.71.165.188:3000/yangshiqiang/NX-zhihui
# Conflicts:
# jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue
# jnpf-java-boot/jnpf-web/src/views/scm/park/index.vue
# jnpf-java-boot/jnpf-web/src/views/scm/space/index.vue
|
3 months ago |
vayne
|
461c0d18ac
|
计量站点配置
|
3 months ago |
zengchenxi
|
f10ddf1c0f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/form.vue
# jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue
|
3 months ago |
zengchenxi
|
9fbdb6680a
|
设备库存,园区设备管理,设备保修信息提交
|
3 months ago |
jiyufei
|
b7eced58af
|
feat(front):前端样式调整;
|
3 months ago |
jiyufei
|
b0a6ff4d37
|
feat():测试问题修复以及代码优化调整;
|
3 months ago |
jiyufei
|
eb68453c50
|
feat():测试问题修复以及代码优化调整;
|
3 months ago |
vayne
|
2b042c5ac7
|
删除逻辑优化
|
3 months ago |
vayne
|
2a4e2a782e
|
园区管理删除逻辑修改
|
3 months ago |
vayne
|
3b70219747
|
空间管理
|
3 months ago |
vayne
|
d88db60ec5
|
Merge branch 'master' of http://222.71.165.188:3000/yangshiqiang/NX-zhihui
# Conflicts:
# jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ParkServiceImpl.java
|
3 months ago |
vayne
|
f17e1d3487
|
园区管理和区域修改
|
3 months ago |
jiyufei
|
3feac22f86
|
feat(bill):账单生成前后端代码补充提交;
|
3 months ago |
jiyufei
|
cb06375025
|
feat(bill):账单生成前后端代码提交;
|
3 months ago |
胡川虎
|
78ccd8168b
|
商户提交
|
3 months ago |
胡川虎
|
0a71792d99
|
商户提交
|
3 months ago |
jiyufei
|
1e707e01db
|
feat():合同管理空间问题提交;
|
3 months ago |
jiyufei
|
0f2f98c4b9
|
feat(front):自测问题修改;
|
3 months ago |
胡川虎
|
aac7a8f88b
|
商户提交
|
3 months ago |
zengchenxi
|
6f07402e04
|
设备库存,园区设备管理,设备保修信息提交
|
3 months ago |
jiyufei
|
1546b8e769
|
feat(front):自测问题修改;
|
3 months ago |
jiyufei
|
d607fd5320
|
feat(front):自测问题修改;
|
3 months ago |
zengchenxi
|
b74e8bd5ed
|
设备库存,园区设备管理,设备保修信息提交
|
3 months ago |
jiyufei
|
a9e83c85ab
|
feat():自测问题修改;
|
3 months ago |
jiyufei
|
404adc93ea
|
feat(contract):装修申请、场地预约前后端代码提交;
|
3 months ago |
jiyufei
|
ad63e25c04
|
feat(contract):装修申请、场地预约前后端代码提交;
|
3 months ago |
jiyufei
|
42b2a45093
|
feat(contract):装修申请、场地预约前后端代码提交;
|
3 months ago |
jiyufei
|
1f7291f950
|
feat(contract):设备租赁前后端代码提交;
|
3 months ago |
zengchenxi
|
9d658102b8
|
设备库存,园区设备管理,设备保修信息提交
|
3 months ago |
vayne
|
6cedb8e83d
|
Merge branch 'master' of http://222.71.165.188:3000/yangshiqiang/NX-zhihui
|
3 months ago |
vayne
|
43888861ff
|
Merge branch 'master' of http://222.71.165.188:3000/yangshiqiang/NX-zhihui
# Conflicts:
# jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ParkMapper.java
# jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ParkService.java
# jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ParkServiceImpl.java
# jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ParkController.java
# jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ParkEntity.java
# jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/park/ParkConstant.java
# jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/park/ParkExcelErrorVO.java
# jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/park/ParkExcelVO.java
# jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/park/ParkForm.java
# jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/park/ParkPagination.java
# jnpf-java-boot/jnpf-web/src/views/scm/park/Detail.vue
# jnpf-java-boot/jnpf-web/src/views/scm/park/form.vue
# jnpf-java-boot/jnpf-web/src/views/scm/park/index.vue
|
3 months ago |
jiyufei
|
2c9769325e
|
feat(contract):合同管理前后端代码提交;
|
3 months ago |
vayne
|
144e7de92b
|
园区管理
|
3 months ago |
胡川虎
|
114fb4f55d
|
商户提交
|
3 months ago |
jiyufei
|
c35f630837
|
feat(contract):合同管理前后端代码提交;
|
3 months ago |
vayne
|
d7e8f86cc0
|
智慧园区
|
3 months ago |