Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java

@@ -125,6 +125,9 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
                 //气涨轴编码
                 code = "VEHICCLE_CODE_QZZ";
                 break;
+            case "0002":
+                code = "VEHICLE_CODE_GXTP";
+                break;
             default:
                 break;
         }

lms/nladmin-ui/src/views/tools/codeGen/codeDetail.vue

@@ -126,6 +126,7 @@ const defaultForm = {
   id: null,
   type: '01',
   init_value: null,
+  code_rule_id: null,
   format: null,
   step: null,
   fillchar: null,
@@ -154,6 +155,7 @@ export default {
     presenter(),
     header(),
     form(function() {
+      defaultForm.code_rule_id = this.dictId
       return Object.assign({ dict: { id: this.dictId }}, defaultForm)
     })],
   data() {