Merge remote-tracking branch 'origin/master'

cloud-market-common/src/main/java/com/muyu/market/domian/Defined.java

@@ -48,7 +48,7 @@ public class Defined extends BaseEntity {
     /**
      * 有效期(天）
      */
-    private Integer definedDateValidity ;
+    private Integer definedDataValidity ;
     /**
      * 接口类型
      */

cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java

@@ -45,7 +45,7 @@ public class DefinedServiceImpl
         /**模糊查询  有效期**/
         queryWrapper.like(
                 StringUtils.isNotEmpty(String.valueOf(definedReq.getDefinedDateValidity())),
-                Defined::getDefinedDateValidity,
+                Defined::getDefinedDataValidity,
                 definedReq.getDefinedDateValidity()
         );