Merge remote-tracking branch 'origin/master'

92895

2020-11-23 3d85fd7de42ead48fd50a99ee3d5d29bbd403b3c

 service-front/src/main/java/com/java110/front/smo/meterWaterImport/impl/MeterWaterImportSMOImpl.java

@@ -38,7 +38,7 @@
 * @Version 1.0
 * add by wuxw 2019/9/23
 **/
@Service("feeImportSMOImpl")
@Service("meterWaterImportSMOImpl")
public class MeterWaterImportSMOImpl extends BaseComponentSMO implements IMeterWaterImportSMO {
    private final static Logger logger = LoggerFactory.getLogger(MeterWaterImportSMOImpl.class);