Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
# Conflicts:
# src/main/java/com/zy/asrs/controller/MatCodeController.java
# src/main/java/com/zy/asrs/utils/VersionUtils.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
# src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
# src/main/resources/application.yml
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public boolean updateLocNo(String newLocNo, String oldLocNo) { |
|---|
| | | return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0; |
|---|
