Merge branch 'master-prod-new' of http://1.15.4.62/r/~chenjiahe/phi_platfor...

chenjiahe

2024-02-18 f68d2259f0fdbf9271f263fab711dcd63e420972

Merge branch 'master-prod-new' of http://1.15.4.62/r/~chenjiahe/phi_platform into master-prod-new

 phi_platform_common/src/main/resources/mapper/platform/TreatProjectMapper.xml

@@ -90,7 +90,7 @@
    <update id="updateEditInfo" parameterType="java.util.Map">
        update treat_project
        set num = #{num}, indication = #{indication} , indicationId = #{indicationId}
          , partType = #{partType}, sdRemark = #{m.sdRemark}, editTime = now()
          , partType = #{partType}, sdRemark = #{sdRemark}, editTime = now()
        where id = #{id}
    </update>
</mapper>

 phi_platform_user/src/main/java/com/hx/phip/controller/promotion/PromotionController.java

@@ -59,7 +59,7 @@
        sql.append(" LEFT JOIN shop AS s ON s.id = p.shopId");
        sql.append(" WHERE p.isDel = #{m.isDel} AND p.isUp = #{m.isUp}");
        if (!StringUtils.isEmpty(promotionDto.getKeyWord())) {
            sql.append(" AND p.name LIKE #{m.keyWord}");
            sql.append(" AND ( p.name LIKE #{m.keyWord} or p.code LIKE #{m.keyWord} ) ");
            sqlMap.put("keyWord", "%" + promotionDto.getKeyWord() + "%");
        }
        sql.append(" ORDER BY p.createTime DESC ");