Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/DictionData.java

@@ -1,9 +1,10 @@
package com.panzhihua.serviceapi.biz.impl;

import lombok.Data;

import java.util.ArrayList;
import java.util.List;

import lombok.Data;

/**
 * @author manailin
 * @date 2021/6/11 16:27