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

guoshilong

2023-05-31 8bd367d113a32601c72dd7cf0f8208f59e109160

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java

@@ -33,6 +33,7 @@
    */
   List<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,
                                      @Param("ad_code") String ad_code,
                                      @Param("p_ad_code") String p_ad_code,
                                      @Param("params") Map<String, Object> params);

   /**