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

huanghongfa

2021-08-31 265efbc31da0cf910f372cc31d12a24d326e0fc0

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopSysConfService.java

@@ -1,7 +1,6 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComShopOrderPayDO;
import com.panzhihua.service_community.model.dos.ComShopSysConfDO;

/**