Commit Graph

2668 Commits

Author SHA1 Message Date
gaojuan c0a18b8651 Merge branch 'script_gj' into 'master'
update bug

See merge request !894
2024-08-08 16:06:24 +08:00
gaojuan d7dd53eb68 update bug 2024-08-08 16:05:24 +08:00
gaojuan 70df447e69 Merge branch 'script_gj' into 'master'
update

See merge request !893
2024-08-08 15:57:24 +08:00
gaojuan 52e1c4ecfb update 2024-08-08 15:56:05 +08:00
majintao e318980b48 客户剩余接口次数查询接口功能开发 2024-08-08 13:58:55 +08:00
sjshenjian e7ae56c04c 修复矛盾点 2024-08-03 17:48:48 +08:00
gaojuan 165eb6bed4 Merge branch 'new_fjw' into 'master'
css update

See merge request !892
2024-08-02 15:55:41 +08:00
gaojuan 8e76714834 css update 2024-08-02 15:54:32 +08:00
gaojuan 1fe407aa82 Merge branch 'new_fjw' into 'master'
css update

See merge request !891
2024-08-02 15:38:15 +08:00
gaojuan 564eb4a701 css update 2024-08-02 15:37:01 +08:00
gaojuan 797378e163 添加大正评估 2024-08-02 13:32:10 +08:00
gaojuan c171b9a010 添加大正地城下拉选项 2024-08-01 15:13:43 +08:00
majintao 24a4fb2163 涉农调用历史结果完善 2024-08-01 10:50:09 +08:00
沈健 fb79e70a67 修复bug 2024-08-01 09:56:24 +08:00
majintao 7344e0d3f5 上海征信涉农接口 2024-07-29 15:33:31 +08:00
majintao 1ed853d041 Merge remote-tracking branch 'origin/master' 2024-07-26 13:49:39 +08:00
majintao 9bdd9f335a 开发区围栏显示 2024-07-26 13:49:21 +08:00
gaojuan cc4058ce9d 新增涉农PC,手机端,留资加限制,所有页面加侧边框 2024-07-25 16:50:10 +08:00
gaojuan 3dc89a4a1e Merge branch 'new_fjw' into 'master'
新增涉农PC,手机端,留资加限制,所有页面加侧边框

See merge request !890
2024-07-25 16:48:37 +08:00
majintao 292844339b Merge remote-tracking branch 'origin/master' 2024-07-24 17:07:24 +08:00
majintao 7f6b48fec3 接口增加次数后刷新缓存 2024-07-24 17:07:02 +08:00
gaojuan 1cc23dcd8d css js 修改 2024-07-24 11:59:14 +08:00
gaojuan e04084f8da Merge branch 'new_fjw' into 'master'
css js 修改

See merge request !889
2024-07-24 11:57:05 +08:00
gaojuan 3a6c4e17a1 add log 2024-07-23 18:32:20 +08:00
gaojuan 81f1586ffe Merge branch 'new_fjw' into 'master'
New fjw

See merge request !888
2024-07-23 18:30:33 +08:00
gaojuan e52cc066a1 css update 2024-07-23 18:28:46 +08:00
gaojuan f24474e74b Merge branch 'new_fjw' into 'master'
css update

See merge request !887
2024-07-23 18:26:41 +08:00
gaojuan 88bee643fd Merge branch 'new_fjw' into 'master'
New fjw

See merge request !886
2024-07-23 11:42:33 +08:00
gaojuan 89b16871f6 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into new_fjw
# Conflicts:
#	projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java
#	projects/fangjia-coresite/src/main/webapp/index.ftl
#	projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java
2024-07-23 11:40:47 +08:00
gaojuan de6c85a9d5 新版房价网 2024-07-23 11:17:37 +08:00
majintao c7c2bae298 Merge remote-tracking branch 'origin/master' 2024-07-23 10:02:27 +08:00
majintao 553b053d45 后台涉农结果导入excel模板 2024-07-23 10:02:12 +08:00
majintao 5761e9c774 涉农结果导入完善 2024-07-22 16:20:22 +08:00
majintao a41d31feb7 涉农结果导入 2024-07-22 14:06:36 +08:00
majintao d6b8bdbfe4 涉农结果导入 2024-07-22 14:04:34 +08:00
majintao d4564eeeea 涉农结果导入 2024-07-22 13:54:11 +08:00
majintao d66f797e77 Merge remote-tracking branch 'origin/master' 2024-07-22 13:29:50 +08:00
majintao 9c5a1e64f5 涉农结果导入 2024-07-22 13:29:32 +08:00
gaojuan 44c9bf89d9 update 2024-07-19 18:23:11 +08:00
gaojuan f946f3f3e7 Merge branch 'script_gj' into 'master'
update

See merge request !885
2024-07-19 18:20:48 +08:00
gaojuan 3cfba82f69 去掉匹配 2024-07-19 17:44:31 +08:00
gaojuan 43f883a489 Merge branch 'script_gj' into 'master'
去掉匹配

See merge request !884
2024-07-19 17:42:03 +08:00
gaojuan 10af540a57 update 2024-07-19 17:38:59 +08:00
gaojuan 32ac1f6d6c Merge branch 'script_gj' into 'master'
update

See merge request !883
2024-07-19 17:36:38 +08:00
majintao 4ef381fc0e 登录后跳转 2024-07-17 14:40:58 +08:00
majintao 5c7d6c0e31 登录后跳转 2024-07-17 14:29:57 +08:00
majintao 337c89a206 新增接口资源,默认改为监控 2024-07-17 14:17:09 +08:00
majintao 73376ef747 添加乡镇或别名查询 2024-07-12 15:13:00 +08:00
majintao f23b7636b1 添加用户,修改密码时加上随机生成复杂密码 2024-07-12 13:33:30 +08:00
majintao 2c4cbda852 Merge remote-tracking branch 'origin/master' 2024-07-12 10:45:05 +08:00